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

make sure dpi are read as integers and divided using float division

Browse source
This commit is contained in:
josch 2015-02-16 19:18:46 +01:00
parent 8887fe21f4
commit 90e954dc0a
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/img2pdf.py
View file

@ -262,6 +262,12 @@ def convert(images, dpi=None, x=None, y=None, title=None, author=None,
debug_out("input dpi (forced) = %d x %d"%ndpi, verbose) debug_out("input dpi (forced) = %d x %d"%ndpi, verbose)
else: else:
ndpi = imgdata.info.get("dpi", (96, 96)) ndpi = imgdata.info.get("dpi", (96, 96))
# in python3, the returned dpi value for some tiff images will
# not be an integer but a float. To make the behaviour of
# img2pdf the same between python2 and python3, we convert that
# float into an integer by rounding
# search online for the 72.009 dpi problem for more info
ndpi = (int(round(ndpi[0])),int(round(ndpi[1])))
debug_out("input dpi = %d x %d"%ndpi, verbose) debug_out("input dpi = %d x %d"%ndpi, verbose)
if colorspace: if colorspace:
@ -307,11 +313,11 @@ def convert(images, dpi=None, x=None, y=None, title=None, author=None,
# pdf units = 1/72 inch # pdf units = 1/72 inch
if not x and not y: if not x and not y:
pdf_x, pdf_y = 72.0*width/ndpi[0], 72.0*height/ndpi[1] pdf_x, pdf_y = 72.0*width/float(ndpi[0]), 72.0*height/float(ndpi[1])
elif not y: elif not y:
pdf_x, pdf_y = x, x*height/width pdf_x, pdf_y = x, x*height/float(width)
elif not x: elif not x:
pdf_x, pdf_y = y*width/height, y pdf_x, pdf_y = y*width/float(height), y
else: else:
pdf_x = x pdf_x = x
pdf_y = y pdf_y = y