commit 6c719c1585eb1a2dbab86cc73ff871da41765981
author Caolán McNamara <caolanm@redhat.com> Fri Apr 20 09:21:25 2012 +0100
committer Caolán McNamara <caolanm@redhat.com> Fri Apr 20 11:55:05 2012 +0100
tree 55a65b69821f136cc712b4cfe839b1da684960b7
parent 442cd72704acc08a09bd4fe8928ff983e2472342

Related: n#615223 local nbyte1 should have been class-level nByte1

filter/source/graphicfilter/itiff/itiff.cxx

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index 7f7023f..22738fc 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -133,7 +133,12 @@ private:
    bool HasAlphaChannel() const;
public:

    TIFFReader() : pAlphaMask(0), pMaskAcc(0) {}
    TIFFReader()
        : pAlphaMask(0)
        , pMaskAcc(0)
        , nByte1(0)
    {
    }
    ~TIFFReader()
    {
        delete pAlphaMask;
@@ -1102,17 +1107,17 @@ void TIFFReader::MakePalCol( void )

void TIFFReader::ReadHeader()
{
    sal_uInt8 nbyte1, nbyte2;
    sal_uInt16 nushort;
    sal_uInt8 nbyte2(0);
    sal_uInt16 nushort(0);

    *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;
}