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

[Stephan Bergmann]

 canvas/source/vcl/canvasbitmaphelper.cxx |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 3ef509a1d9236c6c71e7baa5f7ca7f0a2780fea1
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Feb 26 21:58:10 2017 +0100

    loplugin:loopvartoosmall
    
    Change-Id: I4dce711021557e6e0b1fb661285d32292b0478b6

diff --git a/canvas/source/vcl/canvasbitmaphelper.cxx b/canvas/source/vcl/canvasbitmaphelper.cxx
index e9754dc..0ca9e3d 100644
--- a/canvas/source/vcl/canvasbitmaphelper.cxx
+++ b/canvas/source/vcl/canvasbitmaphelper.cxx
@@ -152,13 +152,13 @@ namespace vclcanvas
         sal_Int8* pRes = aRes.getArray();
 
         int nCurrPos(0);
-        for( int y=rect.Y1;
+        for( long y=rect.Y1;
              y<aBmpSize.Height() && y<rect.Y2;
              ++y )
         {
             if( pAlphaReadAccess.get() != nullptr )
             {
-                for( int x=rect.X1;
+                for( long x=rect.X1;
                      x<aBmpSize.Width() && x<rect.X2;
                      ++x )
                 {
@@ -170,7 +170,7 @@ namespace vclcanvas
             }
             else
             {
-                for( int x=rect.X1;
+                for( long x=rect.X1;
                      x<aBmpSize.Width() && x<rect.X2;
                      ++x )
                 {
@@ -230,8 +230,8 @@ namespace vclcanvas
             const Size aBmpSize( aBitmap.GetSizePixel() );
 
             // for the time being, always read as BGRA
-            int x, y, nCurrPos(0);
-            for( y=rect.Y1;
+            int nCurrPos(0);
+            for( long y=rect.Y1;
                  y<aBmpSize.Height() && y<rect.Y2;
                  ++y )
             {
@@ -244,7 +244,7 @@ namespace vclcanvas
                             Scanline pScan  = pWriteAccess->GetScanline( y );
                             Scanline pAScan = pAlphaWriteAccess->GetScanline( y );
 
-                            for( x=rect.X1;
+                            for( long x=rect.X1;
                                  x<aBmpSize.Width() && x<rect.X2;
                                  ++x )
                             {
@@ -267,7 +267,7 @@ namespace vclcanvas
                             Scanline pScan  = pWriteAccess->GetScanline( y );
                             Scanline pAScan = pAlphaWriteAccess->GetScanline( y );
 
-                            for( x=rect.X1;
+                            for( long x=rect.X1;
                                  x<aBmpSize.Width() && x<rect.X2;
                                  ++x )
                             {
@@ -289,7 +289,7 @@ namespace vclcanvas
                             Scanline pScan  = pWriteAccess->GetScanline( y );
                             Scanline pAScan = pAlphaWriteAccess->GetScanline( y );
 
-                            for( x=rect.X1;
+                            for( long x=rect.X1;
                                  x<aBmpSize.Width() && x<rect.X2;
                                  ++x )
                             {
@@ -308,7 +308,7 @@ namespace vclcanvas
 
                         default:
                         {
-                            for( x=rect.X1;
+                            for( long x=rect.X1;
                                  x<aBmpSize.Width() && x<rect.X2;
                                  ++x )
                             {
@@ -337,7 +337,7 @@ namespace vclcanvas
                         {
                             Scanline pScan = pWriteAccess->GetScanline( y );
 
-                            for( x=rect.X1;
+                            for( long x=rect.X1;
                                  x<aBmpSize.Width() && x<rect.X2;
                                  ++x )
                             {
@@ -355,7 +355,7 @@ namespace vclcanvas
                         {
                             Scanline pScan = pWriteAccess->GetScanline( y );
 
-                            for( x=rect.X1;
+                            for( long x=rect.X1;
                                  x<aBmpSize.Width() && x<rect.X2;
                                  ++x )
                             {
@@ -372,7 +372,7 @@ namespace vclcanvas
                         {
                             Scanline pScan = pWriteAccess->GetScanline( y );
 
-                            for( x=rect.X1;
+                            for( long x=rect.X1;
                                  x<aBmpSize.Width() && x<rect.X2;
                                  ++x )
                             {
@@ -387,7 +387,7 @@ namespace vclcanvas
 
                         default:
                         {
-                            for( x=rect.X1;
+                            for( long x=rect.X1;
                                  x<aBmpSize.Width() && x<rect.X2;
                                  ++x )
                             {