forked from josch/img2pdf
fix JPEG2000 handling after move to Python3
This commit is contained in:
parent
27015c1a6e
commit
dbed55655a
1 changed files with 6 additions and 3 deletions
|
@ -64,9 +64,9 @@ def parse_jp2h(data):
|
|||
while byteStart < noBytes and boxLengthValue != 0:
|
||||
boxLengthValue, boxType, byteEnd, boxContents = \
|
||||
getBox(data, byteStart, noBytes)
|
||||
if boxType == 'ihdr':
|
||||
if boxType == b'ihdr':
|
||||
width, height = parse_ihdr(boxContents)
|
||||
elif boxType == 'colr':
|
||||
elif boxType == b'colr':
|
||||
colorspace = parse_colr(boxContents)
|
||||
byteStart = byteEnd
|
||||
return (width, height, colorspace)
|
||||
|
@ -76,10 +76,13 @@ def parsejp2(data):
|
|||
noBytes = len(data)
|
||||
byteStart = 0
|
||||
boxLengthValue = 1 # dummy value for while loop condition
|
||||
width = None
|
||||
height = None
|
||||
colorspace = None
|
||||
while byteStart < noBytes and boxLengthValue != 0:
|
||||
boxLengthValue, boxType, byteEnd, boxContents = \
|
||||
getBox(data, byteStart, noBytes)
|
||||
if boxType == 'jp2h':
|
||||
if boxType == b'jp2h':
|
||||
width, height, colorspace = parse_jp2h(boxContents)
|
||||
byteStart = byteEnd
|
||||
if not width:
|
||||
|
|
Loading…
Reference in a new issue