Skip to content

Fix number of layers check #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
scaramallion merged 1 commit into from
Dec 10, 2025
Merged

Fix number of layers check #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions openjpeg/_openjpeg.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,8 @@ def encode_array(
"Only one of 'compression_ratios' or 'signal_noise_ratios' is "
"allowed when performing lossy compression"
)
if len(compression_ratios) > 10 or len(signal_noise_ratios) > 10:
raise ValueError("More than 10 compression layers is not supported")
if len(compression_ratios) > 100 or len(signal_noise_ratios) > 100:
raise ValueError("More than 100 compression layers is not supported")

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

dst = BytesIO()
return_code = EncodeBuffer(
Expand Down
16 changes: 8 additions & 8 deletions openjpeg/tests/test_encode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,9 @@ def test_invalid_photometric_raises(self):

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

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

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

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

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

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

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

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