diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-02-23 11:01:00 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-02-23 11:06:59 +0000 |
| commit | 840ad0a88045021c58644404a099a3678a371020 (patch) | |
| tree | 67733ebfae156d8a7791c5f04bf04aa4d1e90000 /filter | |
| parent | d8a277479f2cbbf46cf74e74ad16f890fd21dc91 (diff) | |
improve scoping
Change-Id: Ic79d46da4e322a0f52981c3a3df65f7f0294fdd8
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/graphicfilter/itiff/itiff.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index 6101d20755fb..4fdbb3066aff 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -782,7 +782,7 @@ sal_uLong TIFFReader::GetBits( const sal_uInt8 * pSrc, sal_uLong nBitsPos, sal_u bool TIFFReader::ConvertScanline(sal_Int32 nY) { - sal_uInt32 nRed, nGreen, nBlue, ns, nVal, nByteCount; + sal_uInt32 nRed, nGreen, nBlue, ns, nVal; sal_uInt8 nByteVal; if ( nDstBitsPerPixel == 24 ) @@ -993,10 +993,11 @@ bool TIFFReader::ConvertScanline(sal_Int32 nY) case 1 : { + sal_uInt32 nByteCount = ( nImageWidth >> 3 ) + 1; + if ( bByteSwap ) { sal_Int32 nx = 0; - nByteCount = ( nImageWidth >> 3 ) + 1; while ( --nByteCount ) { nByteVal = *pt++; @@ -1029,7 +1030,6 @@ bool TIFFReader::ConvertScanline(sal_Int32 nY) else { sal_Int32 nx = 7; - nByteCount = ( nImageWidth >> 3 ) + 1; while ( --nByteCount ) { nByteVal = *pt++; |