diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-03-01 11:12:45 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-03-06 17:56:57 +0100 |
| commit | b779e000d979b61ad0d238cb14365151fdb2622b (patch) | |
| tree | bdc6f8359583f1a4515e553f1fec7d7053443f8b /vcl | |
| parent | 6dc4a3b254e4cf852e7e1c4d17117df55e0c160b (diff) | |
ofz: Z_NEED_DICT is unsupported
Change-Id: Ib0945d5a4606915aff9ee3019203caaf2a3cc7c5
(cherry picked from commit aacaacc16938b030a1341d8dbaf56c6a2efeb1dc)
Reviewed-on: https://gerrit.libreoffice.org/34744
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 92fcd775ef67df1c96a417151a60a94530379b8f)
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/qa/cppunit/graphicfilter/data/bmp/fail/nodict-compress.bmp | bin | 0 -> 110 bytes | |||
| -rw-r--r-- | vcl/source/gdi/dibtools.cxx | 5 |
2 files changed, 3 insertions, 2 deletions
diff --git a/vcl/qa/cppunit/graphicfilter/data/bmp/fail/nodict-compress.bmp b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/nodict-compress.bmp Binary files differnew file mode 100644 index 000000000000..a75d6ebae540 --- /dev/null +++ b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/nodict-compress.bmp diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index 5416da44699a..ab5d36f6a4a4 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -856,7 +856,8 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, AlphaMask* pBmpAlpha, sal_u // Seek behind the encoded block. There might have been bytes left or the codec might have read more than necessary. rIStm.Seek(nCodedSize + nCodedPos); } - else + + if (aData.empty()) { // add something so we can take address of the first element aData.resize(1); @@ -865,7 +866,7 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, AlphaMask* pBmpAlpha, sal_u // set decoded bytes to memory stream, // from which we will read the bitmap data - pMemStm.reset( new SvMemoryStream); + pMemStm.reset(new SvMemoryStream); pIStm = pMemStm.get(); assert(!aData.empty()); pMemStm->SetBuffer( &aData.front(), nUncodedSize, false, nUncodedSize ); |
