summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-07 12:10:20 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-07 12:49:41 +0200
commit5ab441664a6207fcff48c14b950db157c4c6d39d (patch)
treeab74e1637aa42fb10bc94c0b03f7b2e54ce8f7e7
parent61806cb98388c42f950ec8db2f51f4fd402db67d (diff)
clang-analyzer-deadcode.DeadStores
Change-Id: I4c9013fca76b213a725e39a47e61775caf5e8519
-rw-r--r--filter/source/graphicfilter/epict/epict.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index b421497ee51a..267488b487f8 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -870,7 +870,7 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize,
Bitmap aBitmap( rBitmap );
sal_uLong nWidth, nHeight, nDstRowBytes, nx, nc, ny, nCount, nColTabSize, i;
- sal_uLong nDstRowPos, nSrcRowBytes, nEqu3, nPos, nDstMapPos;
+ sal_uLong nDstRowPos, nEqu3, nPos, nDstMapPos;
sal_uInt16 nBitsPerPixel, nPackType;
sal_uInt8 *pComp[4], *pTemp;
sal_uInt8 nEquData = 0;
@@ -899,8 +899,7 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize,
// If 24-Bit, then create the Opcode 'DirectBitsRect':
if ( nBitsPerPixel == 24 )
{
- // Calculate the number of bytes of an (uncompressed) line of source and destination.
- nSrcRowBytes =( ( 3 * nWidth ) + 0x0003 ) & 0xfffc;
+ // Calculate the number of bytes of an (uncompressed) line of destination.
nDstRowBytes = nWidth * 4;
// writing Opcode and BaseAddr (?):
@@ -1086,7 +1085,7 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize,
// Calculate the number of bytes of an (unpacked) line of source an destination.
nDstRowBytes = ( nWidth * nBitsPerPixel + 7 ) >> 3;
- nSrcRowBytes = ( nDstRowBytes + 3 ) & 0xfffffffc;
+ sal_uLong nSrcRowBytes = ( nDstRowBytes + 3 ) & 0xfffffffc;
// writing Opcode:
pPict->WriteUInt16( 0x0098 );