Merge branch 'issue159' into devel

This commit is contained in:
John Evans 2014-03-12 10:11:19 -04:00
commit 4d4ecac166

View file

@ -772,6 +772,19 @@ class Jp2k(Jp2kBox):
"""
self._subsampling_sanity_check()
# Must check the specified rlevel against the maximum.
if rlevel != 0:
# Must check the specified rlevel against the maximum.
codestream = self.get_codestream()
max_rlevel = codestream.segment[2].spcod[4]
if rlevel == -1:
# -1 is shorthand for the largest rlevel
rlevel = max_rlevel
elif rlevel < -1 or rlevel > max_rlevel:
msg = "rlevel must be in the range [-1, {0}] for this image."
msg = msg.format(max_rlevel)
raise IOError(msg)
with ExitStack() as stack:
try:
# Set decoding parameters.