[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - filter/source

[Caolán McNamara]

 filter/source/graphicfilter/itiff/itiff.cxx |   20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

New commits:
commit 27c0a5a0567f617d9899e000e6dcf4e8de681ebc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 22 15:06:10 2013 +0100

    Resolves: fdo#68275 Grayscale TIFF is imported as white
    
    this reverts 6c719c1585eb1a2dbab86cc73ff871da41765981 "n#615223 local nbyte1
    should have been class-level nByte1" which was to fix the use seen
    in valgrind og the uninitialized nByte1
    
    So additionally remove the use of the uninit nByte1 entirely
    
    Change-Id: I5b3f4fa00d74e545f207a11a5e90935f14a23a8e
    (cherry picked from commit 98a61a2ae109f3d72940274ceafcf3e84d79aa0b)
    Reviewed-on: https://gerrit.libreoffice.org/5584
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index e2ebadb..7b47690 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -63,7 +63,6 @@ private:
     sal_uInt16              nDataType;
     // Data taken from the TIFF tags:
     sal_Bool                bByteSwap;                  // sal_True if bits 0..7 -> 7..0 should get converted ( FILLORDER = 2 );
-    sal_uInt8               nByte1;                     // 'I', if the format is LittleEndian
 
     sal_uLong               nNewSubFile;                //
     sal_uLong               nSubFile;                   //
@@ -126,12 +125,7 @@ private:
     bool HasAlphaChannel() const;
 public:
 
-    TIFFReader()
-        : pAlphaMask(0)
-        , pMaskAcc(0)
-        , nByte1(0)
-    {
-    }
+    TIFFReader() : pAlphaMask(0), pMaskAcc(0) {}
     ~TIFFReader()
     {
         delete pAlphaMask;
@@ -1021,8 +1015,6 @@ sal_Bool TIFFReader::ConvertScanline( sal_uLong nY )
         {
             sal_uLong nMinMax = ( ( 1 << 8 /*nDstBitsPerPixel*/ ) - 1 ) / ( nMaxSampleValue - nMinSampleValue );
             sal_uInt8*  pt = pMap[ 0 ];
-            if ( nByte1 == 'I' )
-                pt++;
             for ( nx = 0; nx < nImageWidth; nx++, pt += 2 )
             {
                 pAcc->SetPixelIndex( nY, nx, static_cast<sal_uInt8>( ((sal_uLong)*pt - nMinSampleValue) * nMinMax) );
@@ -1089,17 +1081,17 @@ void TIFFReader::MakePalCol( void )
 
 void TIFFReader::ReadHeader()
 {
-    sal_uInt8 nbyte2(0);
-    sal_uInt16 nushort(0);
+    sal_uInt8 nbyte1, nbyte2;
+    sal_uInt16 nushort;
 
-    *pTIFF >> nByte1;
-    if ( nByte1 == 'I' )
+    *pTIFF >> nbyte1;
+    if ( nbyte1 == 'I' )
         pTIFF->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
     else
         pTIFF->SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
 
     *pTIFF >> nbyte2 >> nushort;
-    if ( nByte1 != nbyte2 || ( nByte1 != 'I' && nByte1 != 'M' ) || nushort != 0x002a )
+    if ( nbyte1 != nbyte2 || ( nbyte1 != 'I' && nbyte1 != 'M' ) || nushort != 0x002a )
         bStatus = sal_False;
 }