josch/img2pdf
3
6
Fork 10
Code Issues 22 Pull requests 5 Projects Releases 3 Wiki Activity

Add pillow 2.4.0 support

Browse source 
Pillow 2.4.0 added support for JPEG2000 using OpenJPEG 2.0. Because
Pillow calls the format JPEG2000 instead of JP2, we need to rename it to
enable the optimized code path. Should still be backwards compatible.
This commit is contained in:
Felix Bünemann 2014-04-05 01:55:03 +02:00
parent 818db1902f
commit a3046ca771
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/img2pdf.py
View file

@ -133,7 +133,7 @@ class pdfdoc(object):
# either embed the whole jpeg or deflate the bitmap representation # either embed the whole jpeg or deflate the bitmap representation
if imgformat is "JPEG": if imgformat is "JPEG":
ofilter = [ "/DCTDecode" ] ofilter = [ "/DCTDecode" ]
elif imgformat is "JP2": elif imgformat is "JPEG2000":
ofilter = [ "/JPXDecode" ] ofilter = [ "/JPXDecode" ]
self.version = 5 # jpeg2000 needs pdf 1.5 self.version = 5 # jpeg2000 needs pdf 1.5
else: else:
@ -218,7 +218,7 @@ def convert(images, dpi, title=None, author=None, creator=None, producer=None,
exit(1) exit(1)
# image is jpeg2000 # image is jpeg2000
width, height, ics = parsejp2(rawdata) width, height, ics = parsejp2(rawdata)
imgformat = "JP2" imgformat = "JPEG2000"
if dpi: if dpi:
ndpi = dpi, dpi ndpi = dpi, dpi
@ -256,7 +256,7 @@ def convert(images, dpi, title=None, author=None, creator=None, producer=None,
# depending on the input format, determine whether to pass the raw # depending on the input format, determine whether to pass the raw
# image or the zlib compressed color information # image or the zlib compressed color information
if imgformat is "JPEG" or imgformat is "JP2": if imgformat is "JPEG" or imgformat is "JPEG2000":
if color == '1': if color == '1':
error_out("jpeg can't be monochrome") error_out("jpeg can't be monochrome")
exit(1) exit(1)