summaryrefslogtreecommitdiff
path: root/include/tools/solar.h
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-03-04 14:10:05 +0100
committerStephan Bergmann <sbergman@redhat.com>2019-03-04 16:37:27 +0100
commitd66dbe0f9de76405052352d6bfc369a7c2b0a8e3 (patch)
tree5fb12117dada35c79eeee4713977d4bb1afb1b00 /include/tools/solar.h
parentd515aaa11c42a9d5698380c2288ca7eb65228371 (diff)
Rename SVBT16ToShort to SVBT16ToUInt16
For one, it that way matches reality (as it returns sal_uInt16, not short or sal_Int16) and its SVBT32ToUInt32 counterpart. For another, I plan a follow-up commit of introducing an additional SVBT16ToInt16 to explicitly return sal_Int16. Change-Id: I28915e6593ccdca0c11d7b2fa593e96e359a9532 Reviewed-on: https://gerrit.libreoffice.org/68686 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/tools/solar.h')
-rw-r--r--include/tools/solar.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/tools/solar.h b/include/tools/solar.h
index 5ea3be835525..5d078763d3f7 100644
--- a/include/tools/solar.h
+++ b/include/tools/solar.h
@@ -46,7 +46,7 @@ typedef sal_uInt8 SVBT64[8];
#ifdef __cplusplus
-inline sal_uInt16 SVBT16ToShort( const SVBT16 p ) { return static_cast<sal_uInt16>
+inline sal_uInt16 SVBT16ToUInt16( const SVBT16 p ) { return static_cast<sal_uInt16>
(static_cast<sal_uInt16>(p[0])
+ (static_cast<sal_uInt16>(p[1]) << 8)); }
inline sal_uInt32 SVBT32ToUInt32 ( const SVBT32 p ) { return static_cast<sal_uInt32>