Kaydet (Commit) 9263fbe3 authored tarafından Caolán McNamara's avatar Caolán McNamara

inner condition is the same as outer one

Change-Id: If573f4d21492506d631861d06842828f9abb61f4
üst 123c4f4a
...@@ -990,15 +990,12 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo ...@@ -990,15 +990,12 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo
{ {
for ( ny = 0; ny < nHeight; ny++ ) for ( ny = 0; ny < nHeight; ny++ )
{ {
if ( nRowBytes < 8 || nPackType == 1 ) for ( nx = 0; nx < nWidth; nx++ )
{ {
for ( nx = 0; nx < nWidth; nx++ ) pPict->ReadUChar( nDummy ).ReadUChar( nRed ).ReadUChar( nGreen ).ReadUChar( nBlue );
{ pAcc->SetPixel( ny, nx, BitmapColor( nRed, nGreen, nBlue) );
pPict->ReadUChar( nDummy ).ReadUChar( nRed ).ReadUChar( nGreen ).ReadUChar( nBlue );
pAcc->SetPixel( ny, nx, BitmapColor( nRed, nGreen, nBlue) );
}
nDataSize += ( (sal_uLong)nWidth ) * 4;
} }
nDataSize += ( (sal_uLong)nWidth ) * 4;
} }
} }
else if ( nPackType == 2 ) else if ( nPackType == 2 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment