diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-09-18 15:31:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-09-18 16:23:37 +0200 |
| commit | 76650583fa8f9689de0d338a51587b97fda0426b (patch) | |
| tree | 63b2e1ccc38b9a1f02ba37f727e5c0579ffcd900 /vcl/source/filter | |
| parent | 37b79c872b2637912c5d6972812ee2c9d5b096c7 (diff) | |
not actually using the ZCodec CRC here
so don't bother to compute it
Change-Id: I62f3b4dda2ac12e2a7bff9fdf0f40b3074e33382
Reviewed-on: https://gerrit.libreoffice.org/79097
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/filter')
| -rw-r--r-- | vcl/source/filter/png/pngread.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/filter/png/pngwrite.cxx | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/vcl/source/filter/png/pngread.cxx b/vcl/source/filter/png/pngread.cxx index c53ea879368f..286b2680d1df 100644 --- a/vcl/source/filter/png/pngread.cxx +++ b/vcl/source/filter/png/pngread.cxx @@ -904,7 +904,7 @@ void PNGReaderImpl::ImplReadIDAT() if ( !mbzCodecInUse ) { mbzCodecInUse = true; - mpZCodec.BeginCompression( ZCODEC_NO_COMPRESSION, true ); + mpZCodec.BeginCompression( ZCODEC_NO_COMPRESSION ); } mpZCodec.SetBreak( mnChunkLen ); SvMemoryStream aIStrm( &(*maDataIter), mnChunkLen, StreamMode::READ ); diff --git a/vcl/source/filter/png/pngwrite.cxx b/vcl/source/filter/png/pngwrite.cxx index 1449ce8da9b5..8190c1efd38a 100644 --- a/vcl/source/filter/png/pngwrite.cxx +++ b/vcl/source/filter/png/pngwrite.cxx @@ -83,7 +83,6 @@ private: sal_uInt8 mnFilterType; // 0 or 4; sal_uLong mnBBP; // bytes per pixel ( needed for filtering ) bool mbTrueAlpha; - sal_uLong mnCRC; void ImplWritepHYs(const BitmapEx& rBitmapEx); void ImplWriteIDAT(); @@ -112,7 +111,6 @@ PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBitmapEx, , mnFilterType(0) , mnBBP(0) , mbTrueAlpha(false) - , mnCRC(0) { if (!rBitmapEx.IsEmpty()) { @@ -396,8 +394,7 @@ void PNGWriterImpl::ImplWriteIDAT() mpCurrentScan.reset(new sal_uInt8[mnDeflateInSize]); ImplClearFirstScanline(); } - mpZCodec.BeginCompression(mnCompLevel, true); - mpZCodec.SetCRC(mnCRC); + mpZCodec.BeginCompression(mnCompLevel); SvMemoryStream aOStm; if (mnInterlaced == 0) { @@ -461,7 +458,6 @@ void PNGWriterImpl::ImplWriteIDAT() } } mpZCodec.EndCompression(); - mnCRC = mpZCodec.GetCRC(); if (mnFilterType) // using filter type 4 we need memory for the scanline 3 times { |