diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2016-02-20 08:46:10 -0800 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-02-22 17:22:07 +0100 |
| commit | b697180db477a3d2fcefa39f39b8ea6e71ace0b5 (patch) | |
| tree | 2d31b9e3b52b1435a7df39fb80b0c95548df4e42 | |
| parent | 013afef129d80628c3caff04999c952cf55212ee (diff) | |
WaE: 32 to 64 bits implicit on windows..
a misuse od sal_uLong.. int is just fine here.
Change-Id: I09372b6384539cbb0beb557fdd9069cb1c63e235
Reviewed-on: https://gerrit.libreoffice.org/22595
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
(cherry picked from commit 6d5eeb6af585ae525645d844cbbd56e76678a0af)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | vcl/source/gdi/bitmap4.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx index 3d56db313825..464f5546fbb9 100644 --- a/vcl/source/gdi/bitmap4.cxx +++ b/vcl/source/gdi/bitmap4.cxx @@ -942,6 +942,7 @@ extern "C" int SAL_CALL ImplPopArtCmpFnc( const void* p1, const void* p2 ) bool Bitmap::ImplPopArt() { + /* note: GetBitCount() after that is no more than 8 */ bool bRet = ( GetBitCount() <= 8 ) || Convert( BMP_CONVERSION_8BIT_COLORS ); if( bRet ) @@ -954,8 +955,8 @@ bool Bitmap::ImplPopArt() { const long nWidth = pWriteAcc->Width(); const long nHeight = pWriteAcc->Height(); - const sal_uLong nEntryCount = 1UL << pWriteAcc->GetBitCount(); - sal_uLong n; + const int nEntryCount = 1 << pWriteAcc->GetBitCount(); + int n; PopArtEntry* pPopArtTable = new PopArtEntry[ nEntryCount ]; for( n = 0; n < nEntryCount; n++ ) |