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

tdf#115863: fix TIFF import

Browse Source 
Regression from 651e1f6cda

Change-Id: Id1604fb8eb11ea4e39846591e3912b40a7e7cc96
Reviewed-on: https://gerrit.libreoffice.org/50269
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Aron Budea <aron.budea@collabora.com>
This commit is contained in:
Aron Budea
2018-02-24 04:13:51 +01:00
parent 93117a98e8
commit 40c33132cf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
filter/source/graphicfilter/itiff/itiff.cxx
View File

@@ -1394,7 +1394,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
bStatus = nPlanes != 0; bStatus = nPlanes != 0;
} }
sal_uInt32 nDiv = GetRowsPerStrip() + 1; sal_uInt32 nDiv = GetRowsPerStrip();
if ( bStatus ) if ( bStatus )
{ {
@@ -1405,7 +1405,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
{ {
if ( ( nFillOrder == 2 ) && ( nCompression != 5 ) ) // in the LZW mode bits are already being inverted if ( ( nFillOrder == 2 ) && ( nCompression != 5 ) ) // in the LZW mode bits are already being inverted
bByteSwap = true; bByteSwap = true;
nStripsPerPlane = ( nImageLength - 1 ) / nDiv; nStripsPerPlane = ( nImageLength - 1 ) / nDiv + 1;
} }
if ( bStatus ) if ( bStatus )