diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:28:29 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:32:00 +0100 |
commit | d3b6cb7ec2da4afb5687c9d28b2be2f96e6aa7b1 (patch) | |
tree | e9d209d6d5f06cacd8e0df78c7f6b8ad45d74be5 /vcl/source/filter/igif | |
parent | 45979047abbd9da7a29401f298e8ef9ab58ad337 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I05e89f9896170d4df3d1377549ea074f06b884a0
Diffstat (limited to 'vcl/source/filter/igif')
-rw-r--r-- | vcl/source/filter/igif/decode.cxx | 4 | ||||
-rw-r--r-- | vcl/source/filter/igif/gifread.cxx | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/vcl/source/filter/igif/decode.cxx b/vcl/source/filter/igif/decode.cxx index 00d7e7575678..b0454d2cb270 100644 --- a/vcl/source/filter/igif/decode.cxx +++ b/vcl/source/filter/igif/decode.cxx @@ -27,7 +27,7 @@ struct GIFLZWTableEntry }; GIFLZWDecompressor::GIFLZWDecompressor(sal_uInt8 cDataSize) - : pBlockBuf(NULL) + : pBlockBuf(nullptr) , nInputBitsBuf(0) , nOutBufDataLen(0) , nInputBitsBufSize(0) @@ -49,7 +49,7 @@ GIFLZWDecompressor::GIFLZWDecompressor(sal_uInt8 cDataSize) for (sal_uInt16 i = 0; i < nTableSize; ++i) { - pTable[i].pPrev = NULL; + pTable[i].pPrev = nullptr; pTable[i].pFirst = pTable + i; pTable[i].nData = (sal_uInt8) i; } diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx index be41ccebf5b6..cb0e0ee79201 100644 --- a/vcl/source/filter/igif/gifread.cxx +++ b/vcl/source/filter/igif/gifread.cxx @@ -29,9 +29,9 @@ GIFReader::GIFReader( SvStream& rStm ) : aGPalette ( 256 ) , aLPalette ( 256 ) , rIStm ( rStm ) - , pDecomp ( NULL ) - , pAcc8 ( NULL ) - , pAcc1 ( NULL ) + , pDecomp ( nullptr ) + , pAcc8 ( nullptr ) + , pAcc1 ( nullptr ) , nYAcc ( 0 ) , nLastPos ( rStm.Tell() ) , nLogWidth100 ( 0UL ) @@ -66,7 +66,7 @@ GIFReader::GIFReader( SvStream& rStm ) GIFReader::~GIFReader() { - aImGraphic.SetContext( NULL ); + aImGraphic.SetContext( nullptr ); if( pAcc1 ) Bitmap::ReleaseAccess( pAcc1 ); @@ -133,7 +133,7 @@ bool GIFReader::CreateBitmaps( long nWidth, long nHeight, BitmapPalette* pPal, aBmp8.Erase( Color( COL_WHITE ) ); pAcc8 = aBmp8.AcquireWriteAccess(); - bStatus = ( pAcc8 != NULL ); + bStatus = ( pAcc8 != nullptr ); } return bStatus; @@ -459,7 +459,7 @@ void GIFReader::FillImages( sal_uInt8* pBytes, sal_uLong nCount ) { sal_uInt8* pScanline8 = pAcc8->GetScanline( nYAcc ); sal_uLong nSize8 = pAcc8->GetScanlineSize(); - sal_uInt8* pScanline1 = 0; + sal_uInt8* pScanline1 = nullptr; sal_uLong nSize1 = 0; if( bGCTransparent ) @@ -545,12 +545,12 @@ void GIFReader::CreateNewBitmaps() AnimationBitmap aAnimBmp; Bitmap::ReleaseAccess( pAcc8 ); - pAcc8 = NULL; + pAcc8 = nullptr; if( bGCTransparent ) { Bitmap::ReleaseAccess( pAcc1 ); - pAcc1 = NULL; + pAcc1 = nullptr; aAnimBmp.aBmpEx = BitmapEx( aBmp8, aBmp1 ); } else @@ -593,13 +593,13 @@ const Graphic& GIFReader::GetIntermediateGraphic() aImGraphic = BitmapEx( aBmp8, aBmp1 ); pAcc1 = aBmp1.AcquireWriteAccess(); - bStatus = bStatus && ( pAcc1 != NULL ); + bStatus = bStatus && ( pAcc1 != nullptr ); } else aImGraphic = aBmp8; pAcc8 = aBmp8.AcquireWriteAccess(); - bStatus = bStatus && ( pAcc8 != NULL ); + bStatus = bStatus && ( pAcc8 != nullptr ); } return aImGraphic; @@ -814,7 +814,7 @@ VCL_DLLPUBLIC bool ImportGIF( SvStream & rStm, Graphic& rGraphic ) if( !pGIFReader ) pGIFReader = new GIFReader( rStm ); - rGraphic.SetContext( NULL ); + rGraphic.SetContext( nullptr ); eReadState = pGIFReader->ReadGIF( rGraphic ); if( eReadState == GIFREAD_ERROR ) |