diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-11-12 11:53:25 +0000 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-11-13 09:12:50 +0000 |
| commit | 89d74f0735d943b58393c309d0f080499d6ecdd9 (patch) | |
| tree | bb08da552651683c3a67a170c0db27462216e45f | |
| parent | a129959cf3b6821cb1b13e6bb28ed410a0e3223a (diff) | |
valgrind: logic for last-ditch svg detection is busted
bIsGZip was never set, and the condition that uses it is additionally inverted
Change-Id: I0496bb27435c4323d74c1b99467d3ede68e7bee6
(cherry picked from commit 631378fe110ec7c4161a6c36011640522b881c27)
Reviewed-on: https://gerrit.libreoffice.org/12382
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | vcl/source/filter/graphicfilter.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 2274e83acfb8..6a8dc5b815d1 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -662,6 +662,8 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, nCheckSize = nDecompressedSize < 256 ? nDecompressedSize : 256; aCodec.EndCompression(); pCheckArray = sExtendedOrDecompressedFirstBytes; + + bIsGZip = true; } bool bIsSvg(false); @@ -696,7 +698,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, pCheckArray = sExtendedOrDecompressedFirstBytes; - if(!bIsGZip) + if (bIsGZip) { nCheckSize = nDecompressedSize < 2048 ? nDecompressedSize : 2048; } |