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

Tomaž Vajngerl (via logerrit) logerrit at kemper.freedesktop.org
Wed Mar 4 11:58:06 UTC 2020


 vcl/source/filter/graphicfilter.cxx |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 9a37585c6ed73bb56b091bf2affc5d8e22a91afb
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Tue Mar 3 13:07:18 2020 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Wed Mar 4 12:57:23 2020 +0100

    graphic: remove "AllowPartialStreamRead" from graphic import
    
    Only have an impact on PNG anyway, and it's not really clear in
    what way. I don't really find any references where this is set.
    
    Change-Id: I49519f2116bb0d90648910acddd6176261398c6c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89931
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 97fdc15d8200..5597fb760b56 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1421,7 +1421,6 @@ ErrCode GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPath,
     const bool                     bLinkSet = rGraphic.IsGfxLink();
 
     Size                aPreviewSizeHint( 0, 0 );
-    bool                bAllowPartialStreamRead = false;
 
     std::unique_ptr<sal_uInt8[]> pGraphicContent;
     sal_Int32  nGraphicContentSize = 0;
@@ -1444,10 +1443,6 @@ ErrCode GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPath,
                         nImportFlags &=~GraphicFilterImportFlags::ForPreview;
                 }
             }
-            else if ( rPropVal.Name == "AllowPartialStreamRead" )
-            {
-                rPropVal.Value >>= bAllowPartialStreamRead;
-            }
         }
     }
 
@@ -1510,8 +1505,7 @@ ErrCode GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPath,
             if( aPreviewSizeHint.Width() || aPreviewSizeHint.Height() )
             {
                 // position the stream at the end of the image if requested
-                if( !bAllowPartialStreamRead )
-                    aPNGReader.GetChunks();
+                aPNGReader.GetChunks();
             }
             else
             {


More information about the Libreoffice-commits mailing list