mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reduce scope of bPalette

Browse Source 
Change-Id: Icc1fd48e72be6c550b03008a6d7b81bf8a903d44
This commit is contained in:
Caolán McNamara
2017-02-14 10:19:10 +00:00
parent 31de0ac30d
commit 16f5f716de
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
filter/source/graphicfilter/iras/iras.cxx
View File

@@ -50,7 +50,6 @@ private:
sal_Int32 mnDepth, mnImageDatSize, mnType; sal_Int32 mnDepth, mnImageDatSize, mnType;
sal_Int32 mnColorMapType, mnColorMapSize; sal_Int32 mnColorMapType, mnColorMapSize;
sal_uInt8 mnRepCount, mnRepVal; // RLE Decoding sal_uInt8 mnRepCount, mnRepVal; // RLE Decoding
bool mbPalette;
bool ImplReadBody(BitmapWriteAccess * pAcc); bool ImplReadBody(BitmapWriteAccess * pAcc);
bool ImplReadHeader(); bool ImplReadHeader();
@@ -77,7 +76,6 @@ RASReader::RASReader(SvStream &rRAS)
, mnColorMapSize(0) , mnColorMapSize(0)
, mnRepCount(0) , mnRepCount(0)
, mnRepVal(0) , mnRepVal(0)
, mbPalette(false)
{ {
} }
@@ -106,6 +104,8 @@ bool RASReader::ReadRAS(Graphic & rGraphic)
if ( mnDstBitsPerPix <= 8 ) // paletten bildchen if ( mnDstBitsPerPix <= 8 ) // paletten bildchen
{ {
bool bPalette(false);
if ( mnColorMapType == RAS_COLOR_RAW_MAP ) // RAW Colormap wird geskipped if ( mnColorMapType == RAS_COLOR_RAW_MAP ) // RAW Colormap wird geskipped
{ {
sal_uLong nCurPos = m_rRAS.Tell(); sal_uLong nCurPos = m_rRAS.Tell();
@@ -130,7 +130,7 @@ bool RASReader::ReadRAS(Graphic & rGraphic)
{ {
pAcc->SetPaletteColor( i, BitmapColor( nRed[ i ], nGreen[ i ], nBlue[ i ] ) ); pAcc->SetPaletteColor( i, BitmapColor( nRed[ i ], nGreen[ i ], nBlue[ i ] ) );
} }
mbPalette = true; bPalette = true;
} }
else else
return false; return false;
@@ -139,7 +139,7 @@ bool RASReader::ReadRAS(Graphic & rGraphic)
else if ( mnColorMapType != RAS_COLOR_NO_MAP ) // alles andere ist kein standard else if ( mnColorMapType != RAS_COLOR_NO_MAP ) // alles andere ist kein standard
return false; return false;
if ( !mbPalette ) if ( !bPalette )
{ {
mnDstColors = 1 << mnDstBitsPerPix; mnDstColors = 1 << mnDstBitsPerPix;
pAcc->SetPaletteEntryCount( mnDstColors ); pAcc->SetPaletteEntryCount( mnDstColors );