Skip to content

Commit 11bcc1e

Browse files
committed
Fix number of layer check
1 parent d9ca6b2 commit 11bcc1e

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

openjpeg/_openjpeg.pyx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,8 @@ def encode_array(
304304
"Only one of 'compression_ratios' or 'signal_noise_ratios' is "
305305
"allowed when performing lossy compression"
306306
)
307-
if len(compression_ratios) > 10 or len(signal_noise_ratios) > 10:
308-
raise ValueError("More than 10 compression layers is not supported")
307+
if len(compression_ratios) > 100 or len(signal_noise_ratios) > 100:
308+
raise ValueError("More than 100 compression layers is not supported")
309309

310310
# The destination for the encoded J2K codestream, needs to support BinaryIO
311311
dst = BytesIO()
@@ -449,8 +449,8 @@ def encode_buffer(
449449
"Only one of 'compression_ratios' or 'signal_noise_ratios' is "
450450
"allowed when performing lossy compression"
451451
)
452-
if len(compression_ratios) > 10 or len(signal_noise_ratios) > 10:
453-
raise ValueError("More than 10 compression layers is not supported")
452+
if len(compression_ratios) > 100 or len(signal_noise_ratios) > 100:
453+
raise ValueError("More than 100 compression layers is not supported")
454454

455455
dst = BytesIO()
456456
return_code = EncodeBuffer(

openjpeg/tests/test_encode.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,9 @@ def test_invalid_photometric_raises(self):
219219

220220
def test_invalid_compression_ratios_raises(self):
221221
"""Test an invalid 'compression_ratios' raises exceptions."""
222-
msg = "More than 10 compression layers is not supported"
222+
msg = "More than 100 compression layers is not supported"
223223
with pytest.raises(ValueError, match=msg):
224-
encode_array(np.ones((1, 2), dtype="u1"), compression_ratios=[1] * 11)
224+
encode_array(np.ones((1, 2), dtype="u1"), compression_ratios=[1] * 101)
225225

226226
msg = (
227227
"Error encoding the data: invalid compression ratio, lowest value "
@@ -232,9 +232,9 @@ def test_invalid_compression_ratios_raises(self):
232232

233233
def test_invalid_signal_noise_ratios_raises(self):
234234
"""Test an invalid 'signal_noise_ratios' raises exceptions."""
235-
msg = "More than 10 compression layers is not supported"
235+
msg = "More than 100 compression layers is not supported"
236236
with pytest.raises(ValueError, match=msg):
237-
encode_array(np.ones((1, 2), dtype="u1"), signal_noise_ratios=[1] * 11)
237+
encode_array(np.ones((1, 2), dtype="u1"), signal_noise_ratios=[1] * 101)
238238

239239
msg = (
240240
"Error encoding the data: invalid signal-to-noise ratio, lowest "
@@ -802,9 +802,9 @@ def test_compression_snr_raises(self):
802802

803803
def test_invalid_compression_ratios_raises(self):
804804
"""Test an invalid 'compression_ratios' raises exceptions."""
805-
msg = "More than 10 compression layers is not supported"
805+
msg = "More than 100 compression layers is not supported"
806806
with pytest.raises(ValueError, match=msg):
807-
encode_buffer(b"\x00", 1, 1, 1, 8, False, compression_ratios=[1] * 11)
807+
encode_buffer(b"\x00", 1, 1, 1, 8, False, compression_ratios=[1] * 101)
808808

809809
msg = (
810810
"Error encoding the data: invalid compression ratio, lowest value "
@@ -815,9 +815,9 @@ def test_invalid_compression_ratios_raises(self):
815815

816816
def test_invalid_signal_noise_ratios_raises(self):
817817
"""Test an invalid 'signal_noise_ratios' raises exceptions."""
818-
msg = "More than 10 compression layers is not supported"
818+
msg = "More than 100 compression layers is not supported"
819819
with pytest.raises(ValueError, match=msg):
820-
encode_buffer(b"\x00", 1, 1, 1, 8, False, signal_noise_ratios=[1] * 11)
820+
encode_buffer(b"\x00", 1, 1, 1, 8, False, signal_noise_ratios=[1] * 101)
821821

822822
msg = (
823823
"Error encoding the data: invalid signal-to-noise ratio, lowest "

0 commit comments

Comments
 (0)