mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary ZCODEC_DEFAULT_STRATEGY macro

Browse Source 
...and directly use zlib.h's Z_DEFAULT_STRATEGY

Change-Id: Ibf528cbc32afec4d442656aa2963f50c0875d6a5
This commit is contained in:
Stephan Bergmann 2014-05-21 11:06:59 +02:00
parent a34d0fb56f
commit 201d429ad0
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/tools/zcodec.hxx
View File

@ -27,13 +27,11 @@
#define ZCODEC_DEFAULT_COMPRESSION (0x00000006UL)
#define ZCODEC_BEST_COMPRESSION (0x00000009UL)
#define ZCODEC_DEFAULT_STRATEGY (0x00000000UL)
#define ZCODEC_UPDATE_CRC (0x00010000UL)
#define ZCODEC_GZ_LIB (0x00020000UL)
#define ZCODEC_PNG_DEFAULT ( ZCODEC_NO_COMPRESSION | ZCODEC_DEFAULT_STRATEGY | ZCODEC_UPDATE_CRC )
#define ZCODEC_DEFAULT ( ZCODEC_DEFAULT_COMPRESSION | ZCODEC_DEFAULT_STRATEGY )
#define ZCODEC_PNG_DEFAULT ( ZCODEC_NO_COMPRESSION | ZCODEC_UPDATE_CRC )
#define ZCODEC_DEFAULT ( ZCODEC_DEFAULT_COMPRESSION )
class SvStream;

2
tools/source/zcodec/zcodec.cxx
View File

@ -396,7 +396,7 @@ void ZCodec::ImplInitBuf ( bool nIOFlag )
mbInit = 3;
mbStatus = ( deflateInit2_( PZSTREAM, mnCompressMethod & 0xff, Z_DEFLATED,
MAX_WBITS, MAX_MEM_LEVEL, ( mnCompressMethod >> 8 ) & 0xff,
MAX_WBITS, MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY,
ZLIB_VERSION, sizeof( z_stream ) ) >= 0 );
PZSTREAM->next_out = mpOutBuf = new sal_uInt8[ PZSTREAM->avail_out = mnOutBufSize ];