[Libreoffice-commits] core.git: vcl/source

[Norbert Thiebaud]

 vcl/source/gdi/octree.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 8bcc538953ceec4ef266f16cf72329bc6080d08c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Feb 21 07:25:58 2016 -0800

    WaE vs2015 literal implicit casting
    
    Change-Id: Ib3da0dd36243fbd316992e9fa88f4bed37b24f6a
    Reviewed-on: https://gerrit.libreoffice.org/22596
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx
index e56f3d3..81ba003 100644
--- a/vcl/source/gdi/octree.cxx
+++ b/vcl/source/gdi/octree.cxx
@@ -233,10 +233,10 @@ void Octree::GetPalIndex( NODE* pNode )
 InverseColorMap::InverseColorMap( const BitmapPalette& rPal ) :
             nBits( 8 - OCTREE_BITS )
 {
-    const sal_uLong     nColorMax = 1 << OCTREE_BITS;
-    const sal_uLong     xsqr = 1 << ( nBits << 1 );
-    const sal_uLong     xsqr2 = xsqr << 1;
-    const sal_uLong     nColors = rPal.GetEntryCount();
+    const int     nColorMax = 1 << OCTREE_BITS;
+    const long     xsqr = 1L << ( nBits << 1 );
+    const long     xsqr2 = xsqr << 1;
+    const int     nColors = rPal.GetEntryCount();
     const long      x = 1L << nBits;
     const long      x2 = x >> 1L;
     sal_uLong           r, g, b;
@@ -244,7 +244,7 @@ InverseColorMap::InverseColorMap( const BitmapPalette& rPal ) :
 
     ImplCreateBuffers( nColorMax );
 
-    for( sal_uLong nIndex = 0; nIndex < nColors; nIndex++ )
+    for( int nIndex = 0; nIndex < nColors; nIndex++ )
     {
         const BitmapColor&  rColor = rPal[ (sal_uInt16) nIndex ];
         const long          cRed = rColor.GetRed();