From 92fcd775ef67df1c96a417151a60a94530379b8f Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 1 Mar 2017 11:12:45 +0000 Subject: ofz: Z_NEED_DICT is unsupported Change-Id: Ib0945d5a4606915aff9ee3019203caaf2a3cc7c5 (cherry picked from commit aacaacc16938b030a1341d8dbaf56c6a2efeb1dc) Reviewed-on: https://gerrit.libreoffice.org/34744 Tested-by: Jenkins Reviewed-by: Michael Stahl --- .../graphicfilter/data/bmp/fail/nodict-compress.bmp | Bin 0 -> 110 bytes vcl/source/gdi/dibtools.cxx | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 vcl/qa/cppunit/graphicfilter/data/bmp/fail/nodict-compress.bmp (limited to 'vcl') diff --git a/vcl/qa/cppunit/graphicfilter/data/bmp/fail/nodict-compress.bmp b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/nodict-compress.bmp new file mode 100644 index 000000000000..a75d6ebae540 Binary files /dev/null and b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/nodict-compress.bmp differ diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index f45fa3d206c8..c326632fe2a4 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -854,7 +854,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); @@ -863,7 +864,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, nUncodedSize ); -- cgit