Skip to content

Commit ec3a1aa

Browse files
committed
Remove unexpected behaviour where compresslevel 6 works on isal methods
1 parent ed0238b commit ec3a1aa

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

src/isal/isal_zlib.pyx

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ ISAL_DEFAULT_COMPRESSION = 2
4545
Z_BEST_SPEED = ISAL_BEST_SPEED
4646
Z_BEST_COMPRESSION = ISAL_BEST_COMPRESSION
4747
Z_DEFAULT_COMPRESSION = ISAL_DEFAULT_COMPRESSION
48-
cdef int ISAL_DEFAULT_COMPRESSION_I = ISAL_DEFAULT_COMPRESSION
49-
cdef int ZLIB_DEFAULT_COMPRESSION_I = zlib.Z_DEFAULT_COMPRESSION
5048

5149
DEF_BUF_SIZE = zlib.DEF_BUF_SIZE
5250
DEF_MEM_LEVEL = zlib.DEF_MEM_LEVEL
@@ -142,7 +140,7 @@ cdef void arrange_input_buffer(stream_or_state *stream, Py_ssize_t *remains):
142140
remains[0] -= stream.avail_in
143141

144142
def compress(data,
145-
int level=ISAL_DEFAULT_COMPRESSION_I,
143+
int level=ISAL_DEFAULT_COMPRESSION,
146144
int wbits = ISAL_DEF_MAX_HIST_BITS):
147145
"""
148146
Compresses the bytes in *data*. Returns a bytes object with the
@@ -160,9 +158,6 @@ def compress(data,
160158
-9 to -15 will generate a raw compressed string with
161159
no headers and trailers.
162160
"""
163-
if level == ZLIB_DEFAULT_COMPRESSION_I:
164-
level = ISAL_DEFAULT_COMPRESSION_I
165-
166161
# Initialise stream
167162
cdef isal_zstream stream
168163
cdef unsigned int level_buf_size = zlib_mem_level_to_isal(level, DEF_MEM_LEVEL)
@@ -387,8 +382,6 @@ cdef class Compress:
387382
err = isal_deflate_set_dict(&self.stream, zdict, zdict_length)
388383
if err != COMP_OK:
389384
check_isal_deflate_rc(err)
390-
if level == ZLIB_DEFAULT_COMPRESSION_I:
391-
level = ISAL_DEFAULT_COMPRESSION_I
392385
self.stream.level = level
393386
self.stream.level_buf_size = zlib_mem_level_to_isal(level, memLevel)
394387
self.level_buf = <unsigned char *>PyMem_Malloc(self.stream.level_buf_size * sizeof(char))

0 commit comments

Comments
 (0)