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

[Stephan Bergmann (via logerrit)]

 vcl/source/gdi/bitmapex.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit ffe8b5b3e32b6d10c35b20e4d19583e13b8cc511
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Jan 23 10:58:26 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Jan 23 13:17:32 2020 +0100

    Use properly typed vars to iterate over BitmapInfoAccess::Height/Width()
    
    Change-Id: Ib7875c9a5ee31eadcaba7742174520a9c8fad557
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87249
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 2e767e39bc1e..6c1539bcb9bb 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -1088,11 +1088,11 @@ BitmapEx BitmapEx::ModifyBitmapEx(const basegfx::BColorModifierStack& rBColorMod
                 }
                 else if(ScanlineFormat::N24BitTcBgr == xContent->GetScanlineFormat())
                 {
-                    for(sal_uInt32 y(0); y < static_cast<sal_uInt32>(xContent->Height()); y++)
+                    for(long y(0); y < xContent->Height(); y++)
                     {
                         Scanline pScan = xContent->GetScanline(y);
 
-                        for(sal_uInt32 x(0); x < static_cast<sal_uInt32>(xContent->Width()); x++)
+                        for(long x(0); x < xContent->Width(); x++)
                         {
                             const basegfx::BColor aBSource(
                                 *(pScan + 2)* fConvertColor,
@@ -1107,11 +1107,11 @@ BitmapEx BitmapEx::ModifyBitmapEx(const basegfx::BColorModifierStack& rBColorMod
                 }
                 else if(ScanlineFormat::N24BitTcRgb == xContent->GetScanlineFormat())
                 {
-                    for(sal_uInt32 y(0); y < static_cast<sal_uInt32>(xContent->Height()); y++)
+                    for(long y(0); y < xContent->Height(); y++)
                     {
                         Scanline pScan = xContent->GetScanline(y);
 
-                        for(sal_uInt32 x(0); x < static_cast<sal_uInt32>(xContent->Width()); x++)
+                        for(long x(0); x < xContent->Width(); x++)
                         {
                             const basegfx::BColor aBSource(
                                 *pScan * fConvertColor,
@@ -1126,10 +1126,10 @@ BitmapEx BitmapEx::ModifyBitmapEx(const basegfx::BColorModifierStack& rBColorMod
                 }
                 else
                 {
-                    for(sal_uInt32 y(0); y < static_cast<sal_uInt32>(xContent->Height()); y++)
+                    for(long y(0); y < xContent->Height(); y++)
                     {
                         Scanline pScanline = xContent->GetScanline( y );
-                        for(sal_uInt32 x(0); x < static_cast<sal_uInt32>(xContent->Width()); x++)
+                        for(long x(0); x < xContent->Width(); x++)
                         {
                             const BitmapColor aBMCol(xContent->GetColor(y, x));
                             const basegfx::BColor aBSource(