[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - filter/source

[Aron Budea]

 filter/source/graphicfilter/itiff/itiff.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 67440aad72bc0e0163fbc105e5a67ba219363111
Author: Aron Budea <aron.budea at collabora.com>
Date:   Sat Feb 24 04:13:51 2018 +0100

    tdf#115863: fix TIFF import
    
    Regression from 651e1f6cda04468394c65c2fd88d915902ac0306
    
    Change-Id: Id1604fb8eb11ea4e39846591e3912b40a7e7cc96
    Reviewed-on: https://gerrit.libreoffice.org/50269
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    (cherry picked from commit 40c33132cfa6582dfccf17e787f10dd4dbd0819d)
    Reviewed-on: https://gerrit.libreoffice.org/50270
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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 )