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

Michael Stahl mstahl at redhat.com
Fri Sep 6 04:16:40 PDT 2013


 vcl/source/gdi/pngread.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit debded3eb060bd3b0ebaaa16a5e4f47a46fa02a2
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Sep 6 13:13:22 2013 +0200

    warning C4018: '<': signed/unsigned mismatch
    
    Change-Id: I21b8f1037f68ede368bababa8b6b5201cd83104e

diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index f8b4e95..2c9ad11 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -125,8 +125,8 @@ private:
 
 #ifdef DBG_UTIL
     // do some checks in debug mode
-    sal_uInt32          mnAllocSizeScanline;
-    sal_uInt32          mnAllocSizeScanlineAlpha;
+    sal_Int32           mnAllocSizeScanline;
+    sal_Int32           mnAllocSizeScanlineAlpha;
 #endif
     // the temporary Scanline (and alpha) for direct scanline copy to Bitmap
     sal_uInt8*          mpScanline;
@@ -1351,7 +1351,7 @@ void PNGReaderImpl::ImplDrawScanline( sal_uInt32 nXStart, sal_uInt32 nXAdd )
                     sal_uInt8* pScanline(mpScanline);
                     sal_uInt8* pScanlineAlpha(mpScanlineAlpha);
 
-                    for(sal_uInt32 nX(0); nX < maOrigSize.Width(); nX++, pTmp += 4)
+                    for (sal_Int32 nX(0); nX < maOrigSize.Width(); nX++, pTmp += 4)
                     {
                         // prepare content line as BGR by reordering when copying
                         // do not forget to invert alpha (source is alpha, target is opacity)
@@ -1484,7 +1484,7 @@ void PNGReaderImpl::ImplDrawScanline( sal_uInt32 nXStart, sal_uInt32 nXAdd )
                     OSL_ENSURE(mnAllocSizeScanline >= maOrigSize.Width() * 3, "Allocated Scanline too small (!)");
                     sal_uInt8* pScanline(mpScanline);
 
-                    for(sal_uInt32 nX(0); nX < maOrigSize.Width(); nX++, pTmp += 3)
+                    for (sal_Int32 nX(0); nX < maOrigSize.Width(); nX++, pTmp += 3)
                     {
                         // prepare content line as BGR by reordering when copying
                         if(bCustomColorTable)


More information about the Libreoffice-commits mailing list