diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-05-21 11:06:59 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-05-21 15:30:15 +0200 |
| commit | 201d429ad0e8f212c8546ae2133af384f9076a3e (patch) | |
| tree | 2fc9da849e0403bfb15a041e48281565f5efd646 | |
| parent | a34d0fb56fb14f834de76ce3d911f82ece26e17c (diff) | |
Remove unnecessary ZCODEC_DEFAULT_STRATEGY macro
...and directly use zlib.h's Z_DEFAULT_STRATEGY
Change-Id: Ibf528cbc32afec4d442656aa2963f50c0875d6a5
| -rw-r--r-- | include/tools/zcodec.hxx | 6 | ||||
| -rw-r--r-- | tools/source/zcodec/zcodec.cxx | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/tools/zcodec.hxx b/include/tools/zcodec.hxx index 20aadac39f4d..540f2aa68449 100644 --- a/include/tools/zcodec.hxx +++ b/include/tools/zcodec.hxx @@ -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; diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx index abed9d5d0cee..49d4f12d2037 100644 --- a/tools/source/zcodec/zcodec.cxx +++ b/tools/source/zcodec/zcodec.cxx @@ -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 ]; |