summaryrefslogtreecommitdiff
path: root/vcl/source/filter
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-08-16 16:27:55 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-08-17 11:25:21 +0200
commit2e8acde112e1c6754df26902e79a78346ba45a2d (patch)
tree2d836747a7aafdd0b64ab9aabf01be59e94745d4 /vcl/source/filter
parent006a7b50546c57e260245d4630de565705f2fc38 (diff)
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>
Diffstat (limited to 'vcl/source/filter')
-rw-r--r--vcl/source/filter/graphicfilter2.cxx2
-rw-r--r--vcl/source/filter/igif/gifread.cxx24
-rw-r--r--vcl/source/filter/jpeg/JpegWriter.cxx6
-rw-r--r--vcl/source/filter/jpeg/transupp.c2
-rw-r--r--vcl/source/filter/sgfbram.cxx6
-rw-r--r--vcl/source/filter/sgvmain.cxx16
-rw-r--r--vcl/source/filter/wmf/wmfwr.hxx2
7 files changed, 29 insertions, 29 deletions
diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx
index 51ef11b62455..780d11d24eba 100644
--- a/vcl/source/filter/graphicfilter2.cxx
+++ b/vcl/source/filter/graphicfilter2.cxx
@@ -1035,7 +1035,7 @@ bool GraphicDescriptor::ImpDetectSVM( SvStream& rStm, bool bExtendedInfo )
}
else
{
- rStm.SeekRel( -4L );
+ rStm.SeekRel( -4 );
n32 = 0;
rStm.ReadUInt32( n32 );
diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx
index 9b98fceca699..ef2cb32ed7fe 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -264,7 +264,7 @@ bool GIFReader::ReadGlobalHeader()
void GIFReader::ReadPaletteEntries( BitmapPalette* pPal, sal_uLong nCount )
{
- sal_uLong nLen = 3UL * nCount;
+ sal_uLong nLen = 3 * nCount;
const sal_uInt64 nMaxPossible = rIStm.remainingSize();
if (nLen > nMaxPossible)
nLen = nMaxPossible;
@@ -275,7 +275,7 @@ void GIFReader::ReadPaletteEntries( BitmapPalette* pPal, sal_uLong nCount )
{
sal_uInt8* pTmp = pBuf.get();
- for (sal_uLong i = 0UL; i < nCount; ++i)
+ for (sal_uLong i = 0; i < nCount; ++i)
{
BitmapColor& rColor = (*pPal)[i];
@@ -285,11 +285,11 @@ void GIFReader::ReadPaletteEntries( BitmapPalette* pPal, sal_uLong nCount )
}
// if possible accommodate some standard colours
- if( nCount < 256UL )
+ if( nCount < 256 )
{
(*pPal)[ 255UL ] = Color( COL_WHITE );
- if( nCount < 255UL )
+ if( nCount < 255 )
(*pPal)[ 254UL ] = Color( COL_BLACK );
}
}
@@ -478,18 +478,18 @@ bool GIFReader::ReadLocalHeader()
sal_uLong GIFReader::ReadNextBlock()
{
- sal_uLong nRet = 0UL;
+ sal_uLong nRet = 0;
sal_uLong nRead;
sal_uInt8 cBlockSize;
rIStm.ReadUChar( cBlockSize );
if ( rIStm.IsEof() )
- nRet = 4UL;
+ nRet = 4;
else if ( NO_PENDING( rIStm ) )
{
if ( cBlockSize == 0 )
- nRet = 2UL;
+ nRet = 2;
else
{
rIStm.ReadBytes( aSrcBuf.data(), cBlockSize );
@@ -497,7 +497,7 @@ sal_uLong GIFReader::ReadNextBlock()
if( NO_PENDING( rIStm ) )
{
if( bOverreadBlock )
- nRet = 3UL;
+ nRet = 3;
else
{
bool bEOI;
@@ -519,7 +519,7 @@ sal_uLong GIFReader::ReadNextBlock()
void GIFReader::FillImages( const sal_uInt8* pBytes, sal_uLong nCount )
{
- for( sal_uLong i = 0UL; i < nCount; i++ )
+ for( sal_uLong i = 0; i < nCount; i++ )
{
if( nImageX >= nImageWidth )
{
@@ -796,7 +796,7 @@ bool GIFReader::ProcessGIF()
{
bRead = true;
- if ( nRet == 1UL )
+ if ( nRet == 1 )
{
bImGraphicReady = true;
eActAction = NEXT_BLOCK_READING;
@@ -804,14 +804,14 @@ bool GIFReader::ProcessGIF()
}
else
{
- if( nRet == 2UL )
+ if( nRet == 2 )
{
pDecomp.reset();
CreateNewBitmaps();
eActAction = MARKER_READING;
ClearImageExtensions();
}
- else if( nRet == 3UL )
+ else if( nRet == 3 )
{
eActAction = NEXT_BLOCK_READING;
bOverreadBlock = true;
diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx
index 1cf302312b22..d5636c53d2ec 100644
--- a/vcl/source/filter/jpeg/JpegWriter.cxx
+++ b/vcl/source/filter/jpeg/JpegWriter.cxx
@@ -147,7 +147,7 @@ void* JPEGWriter::GetScanline( long nY )
if( mpReadAccess->HasPalette() )
{
- for( long nX = 0L; nX < nWidth; nX++ )
+ for( long nX = 0; nX < nWidth; nX++ )
{
aColor = mpReadAccess->GetPaletteColor( mpReadAccess->GetPixelIndex( nY, nX ) );
*pTmp++ = aColor.GetRed();
@@ -160,7 +160,7 @@ void* JPEGWriter::GetScanline( long nY )
}
else
{
- for( long nX = 0L; nX < nWidth; nX++ )
+ for( long nX = 0; nX < nWidth; nX++ )
{
aColor = mpReadAccess->GetPixel( nY, nX );
*pTmp++ = aColor.GetRed();
@@ -207,7 +207,7 @@ bool JPEGWriter::Write( const Graphic& rGraphic )
for ( long nY = 0; bIsGrey && ( nY < mpReadAccess->Height() ); nY++ )
{
BitmapColor aColor;
- for( long nX = 0L; bIsGrey && ( nX < nWidth ); nX++ )
+ for( long nX = 0; bIsGrey && ( nX < nWidth ); nX++ )
{
aColor = mpReadAccess->HasPalette() ? mpReadAccess->GetPaletteColor( mpReadAccess->GetPixelIndex( nY, nX ) )
: mpReadAccess->GetPixel( nY, nX );
diff --git a/vcl/source/filter/jpeg/transupp.c b/vcl/source/filter/jpeg/transupp.c
index 7e72c21719ac..58f2219f790a 100644
--- a/vcl/source/filter/jpeg/transupp.c
+++ b/vcl/source/filter/jpeg/transupp.c
@@ -30,7 +30,7 @@ jdiv_round_up (long a, long b)
/* Compute a/b rounded up to next integer, ie, ceil(a/b) */
/* Assumes a >= 0, b > 0 */
{
- return (a + b - 1L) / b;
+ return (a + b - 1) / b;
}
#if JPEG_LIB_VERSION >= 70
diff --git a/vcl/source/filter/sgfbram.cxx b/vcl/source/filter/sgfbram.cxx
index 10bb23b2f886..8dcda618c817 100644
--- a/vcl/source/filter/sgfbram.cxx
+++ b/vcl/source/filter/sgfbram.cxx
@@ -238,7 +238,7 @@ bool SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead)
pBuf[i]=aPcx.GetByte(rInp);
}
for(sal_uInt16 i=nWdtInp;i<nWdtOut;i++) pBuf[i]=0; // up to 3 bytes
- rOut.Seek(nOfs+((sal_uLong)rHead.Ysize-j-1L)*(sal_uLong)nWdtOut); // write backwards
+ rOut.Seek(nOfs+((sal_uLong)rHead.Ysize-j-1)*(sal_uLong)nWdtOut); // write backwards
rOut.WriteBytes(pBuf.get(), nWdtOut);
}
} else if (nColors==16) {
@@ -286,7 +286,7 @@ bool SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead)
}
}
for(sal_uInt16 i=nWdtInp*4;i<nWdtOut;i++) pBuf[i]=0; // up to 3 bytes
- rOut.Seek(nOfs+((sal_uLong)rHead.Ysize-j-1L)*(sal_uLong)nWdtOut); // write backwards
+ rOut.Seek(nOfs+((sal_uLong)rHead.Ysize-j-1)*(sal_uLong)nWdtOut); // write backwards
rOut.WriteBytes(pBuf.get(), nWdtOut);
}
} else if (nColors==256) {
@@ -315,7 +315,7 @@ bool SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead)
for(sal_uInt16 i=0;i<rHead.Xsize;i++)
pBuf[i]=aPcx.GetByte(rInp);
for(sal_uInt16 i=rHead.Xsize;i<nWdtOut;i++) pBuf[i]=0; // up to 3 bytes
- rOut.Seek(nOfs+((sal_uLong)rHead.Ysize-j-1L)*(sal_uLong)nWdtOut); // write backwards
+ rOut.Seek(nOfs+((sal_uLong)rHead.Ysize-j-1)*(sal_uLong)nWdtOut); // write backwards
rOut.WriteBytes(pBuf.get(), nWdtOut);
}
}
diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx
index 9b99f445f71a..b26e120874f8 100644
--- a/vcl/source/filter/sgvmain.cxx
+++ b/vcl/source/filter/sgvmain.cxx
@@ -829,7 +829,7 @@ void DrawObjkList( SvStream& rInp, OutputDevice& rOut )
ReadGrupType( rInp, aGrup );
if (!rInp.GetError()) {
rInp.Seek(rInp.Tell()+aGrup.Last); // object appendix
- if(aGrup.GetSubPtr()!=0L) nGrpCnt++; // DrawObjkList(rInp,rOut );
+ if(aGrup.GetSubPtr()!=0) nGrpCnt++; // DrawObjkList(rInp,rOut );
}
} break;
default: {
@@ -839,7 +839,7 @@ void DrawObjkList( SvStream& rInp, OutputDevice& rOut )
}
} // if rInp
if (!rInp.GetError()) {
- if (aObjk.Next==0L) {
+ if (aObjk.Next==0) {
if (nGrpCnt==0) bEnd=true;
else nGrpCnt--;
}
@@ -859,11 +859,11 @@ void SkipObjkList(SvStream& rInp)
GrupType aGrup;
ReadGrupType( rInp, aGrup );
rInp.Seek(rInp.Tell()+aGrup.Last); // object appendix
- if(aGrup.GetSubPtr()!=0L) SkipObjkList(rInp);
+ if(aGrup.GetSubPtr()!=0) SkipObjkList(rInp);
} else {
ObjkOverSeek(rInp,aObjk); // to next object
}
- } while (aObjk.Next!=0L && !rInp.GetError());
+ } while (aObjk.Next!=0 && !rInp.GetError());
}
bool SgfFilterSDrw( SvStream& rInp, GDIMetaFile& rMtf )
@@ -883,7 +883,7 @@ bool SgfFilterSDrw( SvStream& rInp, GDIMetaFile& rMtf )
do { // read standard page
ReadPageType( rInp, aPage );
if (aPage.nList!=0) SkipObjkList(rInp);
- } while (aPage.Next!=0L && !rInp.GetError());
+ } while (aPage.Next!=0 && !rInp.GetError());
nCharPos=rInp.Tell();
ReadPageType( rInp, aPage );
@@ -892,17 +892,17 @@ bool SgfFilterSDrw( SvStream& rInp, GDIMetaFile& rMtf )
Num=aPage.StdPg;
if (Num!=0) {
rInp.Seek(nStdPos);
- while(Num>1 && aPage.Next!=0L && !rInp.GetError()) { // search standard page
+ while(Num>1 && aPage.Next!=0 && !rInp.GetError()) { // search standard page
ReadPageType( rInp, aPage );
if (aPage.nList!=0) SkipObjkList(rInp);
Num--;
}
ReadPageType( rInp, aPage );
- if(Num==1 && aPage.nList!=0L) DrawObjkList( rInp,*pOutDev );
+ if(Num==1 && aPage.nList!=0) DrawObjkList( rInp,*pOutDev );
rInp.Seek(nCharPos);
ReadPageType( rInp, aPage );
}
- if (aPage.nList!=0L) DrawObjkList(rInp,*pOutDev );
+ if (aPage.nList!=0) DrawObjkList(rInp,*pOutDev );
rMtf.Stop();
rMtf.WindStart();
diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx
index c0fd6e5fca56..a3f4885d1706 100644
--- a/vcl/source/filter/wmf/wmfwr.hxx
+++ b/vcl/source/filter/wmf/wmfwr.hxx
@@ -168,7 +168,7 @@ private:
void WMFRecord_SetTextColor(const Color & rColor);
void WMFRecord_SetWindowExt(const Size & rSize);
void WMFRecord_SetWindowOrg(const Point & rPoint);
- void WMFRecord_StretchDIB(const Point & rPoint, const Size & rSize, const Bitmap & rBitmap, sal_uInt32 nROP = 0UL );
+ void WMFRecord_StretchDIB(const Point & rPoint, const Size & rSize, const Bitmap & rBitmap, sal_uInt32 nROP = 0 );
void WMFRecord_TextOut(const Point & rPoint, const OUString & rString);
void WMFRecord_IntersectClipRect( const tools::Rectangle& rRect);