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

fix regression introduced by 9b35f5cf

Browse source
This commit is contained in:
josch 2014-08-24 17:15:43 +02:00
parent 82087d5506
commit 0bdf6472f8
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/img2pdf.py
View file

@ -197,7 +197,7 @@ class pdfdoc(object):
result += "%%EOF\n"
return result
def convert(images, dpi, pdf_x, pdf_y, title=None, author=None, creator=None, producer=None,
def convert(images, dpi, x, y, title=None, author=None, creator=None, producer=None,
creationdate=None, moddate=None, subject=None, keywords=None,
colorspace=None, verbose=False):
@ -268,12 +268,12 @@ def convert(images, dpi, pdf_x, pdf_y, title=None, author=None, creator=None, pr
imgdata = zlib.compress(imgdata.tostring())
# pdf units = 1/72 inch
if not pdf_x and not pdf_y:
if not x and not y:
pdf_x, pdf_y = 72.0*width/ndpi[0], 72.0*height/ndpi[1]
elif not pdf_y:
pdf_y = pdf_x*height/width
elif not pdf_x:
pdf_x = pdf_y*width/height
elif not y:
pdf_x, pdf_y = x, x*height/width
elif not x:
pdf_x, pdf_y = y*width/height, y
pdf.addimage(color, width, height, imgformat, imgdata, pdf_x, pdf_y)