vcl/source/gdi/bitmap4.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
New commits: commit 6d5eeb6af585ae525645d844cbbd56e76678a0af Author: Norbert Thiebaud <nthieb...@gmail.com> Date: Sat Feb 20 08:46:10 2016 -0800 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 <da...@ostrovsky.org> Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com> diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx index 8174c3a..f40ab4b 100644 --- a/vcl/source/gdi/bitmap4.cxx +++ b/vcl/source/gdi/bitmap4.cxx @@ -940,6 +940,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 ) @@ -952,8 +953,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++ ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits