From 2e8acde112e1c6754df26902e79a78346ba45a2d Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Wed, 16 Aug 2017 16:27:55 +0200
Subject: remove UL/L suffixes from integer constants on the RHS of expressions

Change-Id: I899a8126c9d971601fea6c77eca165718aea0ac5
Reviewed-on: https://gerrit.libreoffice.org/41237
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 vcl/source/gdi/dibtools.cxx | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'vcl/source/gdi/dibtools.cxx')

diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 002f617cdb1b..f2dc2c25f474 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -355,7 +355,7 @@ bool ImplDecodeRLE(sal_uInt8* pBuffer, DIBV5Header const & rHeader, BitmapWriteA
     const sal_uLong nWidth = rAcc.Width();
     sal_uLong       nCountByte;
     sal_uLong       nRunByte;
-    sal_uLong       nX = 0UL;
+    sal_uLong       nX = 0;
     sal_uInt8       cTmp;
     bool        bEndDecoding = false;
 
@@ -375,7 +375,7 @@ bool ImplDecodeRLE(sal_uInt8* pBuffer, DIBV5Header const & rHeader, BitmapWriteA
                 {
                     nCountByte = nRunByte >> 1;
 
-                    for( sal_uLong i = 0UL; i < nCountByte; i++ )
+                    for( sal_uLong i = 0; i < nCountByte; i++ )
                     {
                         if (pRLE == pEndRLE)
                             return false;
@@ -410,7 +410,7 @@ bool ImplDecodeRLE(sal_uInt8* pBuffer, DIBV5Header const & rHeader, BitmapWriteA
                 }
                 else
                 {
-                    for( sal_uLong i = 0UL; i < nRunByte; i++ )
+                    for( sal_uLong i = 0; i < nRunByte; i++ )
                     {
                         if (pRLE == pEndRLE)
                             return false;
@@ -433,7 +433,7 @@ bool ImplDecodeRLE(sal_uInt8* pBuffer, DIBV5Header const & rHeader, BitmapWriteA
             else if( !nRunByte )
             {
                 nY--;
-                nX = 0UL;
+                nX = 0;
             }
             else if( nRunByte == 1 )
                 bEndDecoding = true;
@@ -460,7 +460,7 @@ bool ImplDecodeRLE(sal_uInt8* pBuffer, DIBV5Header const & rHeader, BitmapWriteA
             {
                 nRunByte = nCountByte >> 1;
 
-                for( sal_uLong i = 0UL; i < nRunByte; i++ )
+                for( sal_uLong i = 0; i < nRunByte; i++ )
                 {
                     if( nX < nWidth )
                         rAcc.SetPixelIndex(nY, nX++, SanitizePaletteIndex(cTmp >> 4, rPalette, bForceToMonoWhileReading));
@@ -474,7 +474,7 @@ bool ImplDecodeRLE(sal_uInt8* pBuffer, DIBV5Header const & rHeader, BitmapWriteA
             }
             else
             {
-                for( sal_uLong i = 0UL; ( i < nCountByte ) && ( nX < nWidth ); i++ )
+                for( sal_uLong i = 0; ( i < nCountByte ) && ( nX < nWidth ); i++ )
                     rAcc.SetPixelIndex(nY, nX++, SanitizePaletteIndex(cTmp, rPalette, bForceToMonoWhileReading));
             }
         }
@@ -611,7 +611,7 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
                         {
                             if( !nShift )
                             {
-                                nShift = 2UL;
+                                nShift = 2;
                                 cTmp = *pTmp++;
                             }
 
@@ -1030,14 +1030,14 @@ bool ImplReadDIBFileHeader( SvStream& rIStm, sal_uLong& rOffset )
             rIStm.ReadUInt16( nTmp16 );
             rIStm.SeekRel( 8 );
             rIStm.ReadUInt32( nTmp32 );
-            rOffset = nTmp32 - 28UL;
+            rOffset = nTmp32 - 28;
             bRet = ( 0x4D42 == nTmp16 );
         }
         else // 0x4D42 == nTmp16, 'MB' from BITMAPFILEHEADER
         {
             rIStm.SeekRel( 8 );        // we are on bfSize member of BITMAPFILEHEADER, forward to bfOffBits
             rIStm.ReadUInt32( nTmp32 );            // read bfOffBits
-            rOffset = nTmp32 - 14UL;    // adapt offset by sizeof(BITMAPFILEHEADER)
+            rOffset = nTmp32 - 14;    // adapt offset by sizeof(BITMAPFILEHEADER)
             bRet = rIStm.GetError() == ERRCODE_NONE;
         }
 
@@ -1094,7 +1094,7 @@ bool ImplWriteRLE( SvStream& rOStm, BitmapReadAccess const & rAcc, bool bRLE4 )
     for ( long nY = nHeight - 1; nY >= 0; nY-- )
     {
         sal_uInt8* pTmp = pBuf.get();
-        nX = nBufCount = 0UL;
+        nX = nBufCount = 0;
 
         while( nX < nWidth )
         {
@@ -1117,7 +1117,7 @@ bool ImplWriteRLE( SvStream& rOStm, BitmapReadAccess const & rAcc, bool bRLE4 )
             else
             {
                 cLast = cPix;
-                nSaveIndex = nX - 1UL;
+                nSaveIndex = nX - 1;
                 bFound = false;
 
                 while( ( nX < nWidth ) && ( nCount < 256 )
@@ -1150,7 +1150,7 @@ bool ImplWriteRLE( SvStream& rOStm, BitmapReadAccess const & rAcc, bool bRLE4 )
                     }
                     else
                     {
-                        for( sal_uLong i = 0UL; i < nCount; i++ )
+                        for( sal_uLong i = 0; i < nCount; i++ )
                             *pTmp++ = rAcc.GetPixelIndex( nY, nSaveIndex++ );
                     }
 
-- 
cgit