[Libreoffice-commits] core.git: filter/source

[Caolán McNamara]

 filter/source/graphicfilter/itiff/ccidecom.cxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit f01a975cb22d33a386bfd8db4ea6b4b77aceca1b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 1 09:35:34 2017 +0000

    defer this for a while
    
    This reverts commit 99c361be16eb3a21aa679a103db2d07ecd0f5d3c.

diff --git a/filter/source/graphicfilter/itiff/ccidecom.cxx b/filter/source/graphicfilter/itiff/ccidecom.cxx
index b5f3ab4..125d9c8 100644
--- a/filter/source/graphicfilter/itiff/ccidecom.cxx
+++ b/filter/source/graphicfilter/itiff/ccidecom.cxx
@@ -627,9 +627,7 @@ void CCIDecompressor::StartDecompression( SvStream & rIStream )
 
 bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong nTargetBits, bool bLastLine )
 {
-    //Read[1|2]DScanlineData take a sal_uInt16, so its either limit here or expand there
-    if (nTargetBits > SAL_MAX_UINT16)
-        return false;
+    bool b2D;
 
     if ( nEOLCount >= 5 )   // RTC (Return To Controller)
         return true;
@@ -684,7 +682,6 @@ bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong nTarget
     if ( nOptions & CCI_OPTION_BYTEALIGNROW )
         nInputBitsBufSize &= 0xfff8;
 
-    bool b2D;
     // is it a 2D row?
     if ( nOptions & CCI_OPTION_2D )
     {