diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-07 12:16:06 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-07 12:49:42 +0200 |
| commit | 6eaf556542a8635c1d0ecbdfe00a5da394db6a81 (patch) | |
| tree | 9c48a1d57da137df561c08041a9494fab8a82ea7 /filter | |
| parent | clang-analyzer-deadcode.DeadStores (diff) | |
| download | core-6eaf556542a8635c1d0ecbdfe00a5da394db6a81.tar.gz core-6eaf556542a8635c1d0ecbdfe00a5da394db6a81.zip | |
clang-analyzer-deadcode.DeadStores
Change-Id: Ic9d76c173d3948c973a96a97debccc771c2c9ede
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/graphicfilter/ipict/ipict.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 53b1a09fc4e0..de3516b3810d 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -706,9 +706,9 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo BitmapWriteAccess* pAcc = NULL; BitmapReadAccess* pReadAcc = NULL; sal_uInt16 nColTabSize; - sal_uInt16 nRowBytes, nBndX, nBndY, nWidth, nHeight, nVersion, nPackType, nPixelType, + sal_uInt16 nRowBytes, nBndX, nBndY, nWidth, nHeight, nPackType, nPixelSize, nCmpCount, nCmpSize; - sal_uInt32 nPackSize, nPlaneBytes, nHRes, nVRes; + sal_uInt32 nHRes, nVRes; sal_uInt8 nDat, nRed, nGreen, nBlue, nDummy; size_t i, nDataSize = 0; @@ -730,6 +730,10 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo if ( ( nRowBytes & 0x8000 ) != 0 ) { // it is a PixMap nRowBytes &= 0x3fff; + sal_uInt16 nVersion; + sal_uInt32 nPackSize; + sal_uInt16 nPixelType; + sal_uInt32 nPlaneBytes; pPict->ReadUInt16( nVersion ).ReadUInt16( nPackType ).ReadUInt32( nPackSize ).ReadUInt32( nHRes ).ReadUInt32( nVRes ).ReadUInt16( nPixelType ). ReadUInt16( nPixelSize ).ReadUInt16( nCmpCount ).ReadUInt16( nCmpSize ).ReadUInt32( nPlaneBytes ); pPict->SeekRel( 8 ); @@ -769,10 +773,8 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo else { nRowBytes &= 0x3fff; - nVersion = 0; nPackType = 0; - nPackSize = nHRes = nVRes = nPlaneBytes = 0; - nPixelType = 0; + // nHRes = nVRes = 0; nPixelSize = nCmpCount = nCmpSize = 1; nDataSize += 10; aBitmap = Bitmap( Size( nWidth, nHeight ), 1 ); |