diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-10-30 11:32:33 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-10-30 14:34:26 +0000 |
| commit | 9263fbe338604b817e65f5a8e623f96d67224158 (patch) | |
| tree | 115b4373bf78597c3bdeab3582e1f381b9188560 /filter | |
| parent | 123c4f4a6e418fa2babc1f0c383491833aeea947 (diff) | |
inner condition is the same as outer one
Change-Id: If573f4d21492506d631861d06842828f9abb61f4
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/graphicfilter/ipict/ipict.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index a9dcff2922ae..a2f9eae9677f 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -990,15 +990,12 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo { 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) ); - } - nDataSize += ( (sal_uLong)nWidth ) * 4; + pPict->ReadUChar( nDummy ).ReadUChar( nRed ).ReadUChar( nGreen ).ReadUChar( nBlue ); + pAcc->SetPixel( ny, nx, BitmapColor( nRed, nGreen, nBlue) ); } + nDataSize += ( (sal_uLong)nWidth ) * 4; } } else if ( nPackType == 2 ) |