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/gdi/pngread.cxx | |
parent | 45979047abbd9da7a29401f298e8ef9ab58ad337 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I05e89f9896170d4df3d1377549ea074f06b884a0
Diffstat (limited to 'vcl/source/gdi/pngread.cxx')
-rw-r--r-- | vcl/source/gdi/pngread.cxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index fd487c12a769..7996f46fe7c1 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -165,15 +165,15 @@ public: PNGReaderImpl::PNGReaderImpl( SvStream& rPNGStream ) : mrPNGStream( rPNGStream ), - mpBmp ( NULL ), - mpAcc ( NULL ), - mpMaskBmp ( NULL ), - mpAlphaMask ( NULL ), - mpMaskAcc ( NULL ), - mpInflateInBuf ( NULL ), - mpScanPrior ( NULL ), - mpTransTab ( NULL ), - mpScanCurrent ( NULL ), + mpBmp ( nullptr ), + mpAcc ( nullptr ), + mpMaskBmp ( nullptr ), + mpAlphaMask ( nullptr ), + mpMaskAcc ( nullptr ), + mpInflateInBuf ( nullptr ), + mpScanPrior ( nullptr ), + mpTransTab ( nullptr ), + mpScanCurrent ( nullptr ), mpColorTable ( const_cast<sal_uInt8*>(mpDefaultColorTable) ), mnChunkType ( 0 ), mnChunkLen ( 0 ), @@ -208,8 +208,8 @@ PNGReaderImpl::PNGReaderImpl( SvStream& rPNGStream ) mnAllocSizeScanline(0), mnAllocSizeScanlineAlpha(0), #endif - mpScanline(0), - mpScanlineAlpha(0) + mpScanline(nullptr), + mpScanlineAlpha(nullptr) { // prepare the PNG data stream mnOrigStreamMode = mrPNGStream.GetEndian(); @@ -424,7 +424,7 @@ BitmapEx PNGReaderImpl::GetBitmapEx( const Size& rPreviewSizeHint ) // release write access of the bitmaps if ( mpAcc ) - Bitmap::ReleaseAccess( mpAcc ), mpAcc = NULL; + Bitmap::ReleaseAccess( mpAcc ), mpAcc = nullptr; if ( mpMaskAcc ) { @@ -433,7 +433,7 @@ BitmapEx PNGReaderImpl::GetBitmapEx( const Size& rPreviewSizeHint ) else if ( mpMaskBmp ) Bitmap::ReleaseAccess( mpMaskAcc ); - mpMaskAcc = NULL; + mpMaskAcc = nullptr; } // return the resulting BitmapEx @@ -729,7 +729,7 @@ bool PNGReaderImpl::ImplReadTransparent() { bool bNeedAlpha = false; - if ( mpTransTab == NULL ) + if ( mpTransTab == nullptr ) { switch ( mnColorType ) { @@ -793,7 +793,7 @@ bool PNGReaderImpl::ImplReadTransparent() mpMaskBmp = new Bitmap( maTargetSize, 1 ); mpMaskAcc = mpMaskBmp->AcquireWriteAccess(); } - mbTransparent = (mpMaskAcc != NULL); + mbTransparent = (mpMaskAcc != nullptr); if( !mbTransparent ) return false; mcOpaqueColor = BitmapColor( 0x00 ); |