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

fix problem with conversion of closed file

Browse source
This commit is contained in:
josch 2014-11-10 10:13:52 +01:00
parent 45452db4d2
commit d8a11d839c
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/img2pdf.py
View file

@ -252,29 +252,29 @@ def convert(images, dpi, x, y, title=None, author=None, creator=None, producer=N
color = imgdata.mode color = imgdata.mode
debug_out("input colorspace = %s"%(color), verbose) debug_out("input colorspace = %s"%(color), verbose)
debug_out("width x height = %d x %d"%(width,height), verbose) debug_out("width x height = %d x %d"%(width,height), verbose)
debug_out("imgformat = %s"%imgformat, verbose) debug_out("imgformat = %s"%imgformat, verbose)
# 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 "JPEG2000": 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)
imgdata = rawdata imgdata = rawdata
else:
# because we do not support /CCITTFaxDecode
if color == '1':
debug_out("Converting colorspace 1 to L", verbose)
imgdata = imgdata.convert('L')
color = 'L'
elif color in ("RGB", "L"):
debug_out("Colorspace is OK: %s"%color, verbose)
else: else:
debug_out("Converting colorspace %s to RGB"%color, verbose) # because we do not support /CCITTFaxDecode
imgdata = imgdata.convert('RGB') if color == '1':
color = imgdata.mode debug_out("Converting colorspace 1 to L", verbose)
imgdata = zlib.compress(imgdata.tostring()) imgdata = imgdata.convert('L')
color = 'L'
elif color in ("RGB", "L"):
debug_out("Colorspace is OK: %s"%color, verbose)
else:
debug_out("Converting colorspace %s to RGB"%color, verbose)
imgdata = imgdata.convert('RGB')
color = imgdata.mode
imgdata = zlib.compress(imgdata.tostring())
# pdf units = 1/72 inch # pdf units = 1/72 inch
if not x and not y: if not x and not y: