diff options
| author | Aron Budea <aron.budea@collabora.com> | 2018-02-24 04:13:51 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-02-24 17:16:09 +0100 |
| commit | 67440aad72bc0e0163fbc105e5a67ba219363111 (patch) | |
| tree | e1d1dd824f9f5f45beca02ca5935fc45aa9dcdd8 | |
| parent | 46980ee24a04f6bcc9ace4217f6b6c929adb0625 (diff) | |
tdf#115863: fix TIFF import
Regression from 651e1f6cda04468394c65c2fd88d915902ac0306
Change-Id: Id1604fb8eb11ea4e39846591e3912b40a7e7cc96
Reviewed-on: https://gerrit.libreoffice.org/50269
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Aron Budea <aron.budea@collabora.com>
(cherry picked from commit 40c33132cfa6582dfccf17e787f10dd4dbd0819d)
Reviewed-on: https://gerrit.libreoffice.org/50270
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | filter/source/graphicfilter/itiff/itiff.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index 12e53b314478..3f2d905d0acc 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -1361,7 +1361,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) bStatus = nPlanes != 0; } - sal_uInt32 nDiv = GetRowsPerStrip() + 1; + sal_uInt32 nDiv = GetRowsPerStrip(); if ( bStatus ) { @@ -1372,7 +1372,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) { if ( ( nFillOrder == 2 ) && ( nCompression != 5 ) ) // in the LZW mode bits are already being inverted bByteSwap = true; - nStripsPerPlane = ( nImageLength - 1 ) / nDiv; + nStripsPerPlane = ( nImageLength - 1 ) / nDiv + 1; } if ( bStatus ) |