diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2019-04-04 17:53:47 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2019-04-04 15:04:01 +0200 |
| commit | dc7fdd7e75ba4089e3c385479fd6b303d518efe5 (patch) | |
| tree | 179be66ca858b4c9088618ac13b9757bbd01e26c /include/vcl/bitmap.hxx | |
| parent | 810e62b8ba9c0fa5152592ef6b01400bfcfe59c0 (diff) | |
change GetColorCount to use sal_Int64
Hopefully fixes problems on 32-bit linux.
Change-Id: I1fc22f1bb37c8297bd3bd6828206d1ffa9ae722d
Reviewed-on: https://gerrit.libreoffice.org/70241
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'include/vcl/bitmap.hxx')
| -rw-r--r-- | include/vcl/bitmap.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 16dad0e6601d..71007c86b33d 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -131,7 +131,7 @@ public: Size GetSizePixel() const; sal_uInt16 GetBitCount() const; - inline sal_uLong GetColorCount() const; + inline sal_Int64 GetColorCount() const; inline sal_uLong GetSizeBytes() const; bool HasGreyPalette() const; /** get system dependent bitmap data @@ -574,9 +574,9 @@ inline void Bitmap::SetPrefSize( const Size& rSize ) maPrefSize = rSize; } -inline sal_uLong Bitmap::GetColorCount() const +inline sal_Int64 Bitmap::GetColorCount() const { - return( sal_uLong(1) << static_cast<sal_uLong>(GetBitCount()) ); + return sal_Int64(1) << sal_Int64(GetBitCount()); } inline sal_uLong Bitmap::GetSizeBytes() const |