phmccarty/img2pdf
1
0
Fork 0
forked from josch/img2pdf
Code Pull requests Activity

support file objects as input

Browse source
This commit is contained in:
josch 2015-02-16 07:39:07 +01:00
parent 18ca3b4491
commit 3fdd824201
7 changed files with 83 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

158
src/img2pdf.py
View file

@ -24,6 +24,10 @@ import struct
from PIL import Image from PIL import Image
from datetime import datetime from datetime import datetime
from jp2 import parsejp2 from jp2 import parsejp2
try:
from cStringIO import cStringIO
except ImportError:
from io import BytesIO as cStringIO
# XXX: Switch to use logging module. # XXX: Switch to use logging module.
def debug_out(message, verbose=True): def debug_out(message, verbose=True):
@ -214,85 +218,89 @@ def convert(images, dpi=None, x=None, y=None, title=None, author=None,
for imfilename in images: for imfilename in images:
debug_out("Reading %s"%imfilename, verbose) debug_out("Reading %s"%imfilename, verbose)
with open(imfilename, "rb") as im: try:
rawdata = im.read() rawdata = imfilename.read()
im.seek(0) im = cStringIO(rawdata)
try: except:
imgdata = Image.open(im) with open(imfilename, "rb") as im:
except IOError as e: rawdata = im.read()
# test if it is a jpeg2000 image im = cStringIO(rawdata)
if rawdata[:12] != "\x00\x00\x00\x0C\x6A\x50\x20\x20\x0D\x0A\x87\x0A": try:
error_out("cannot read input image (not jpeg2000)") imgdata = Image.open(im)
error_out("PIL: %s"%e) except IOError as e:
exit(1) # test if it is a jpeg2000 image
# image is jpeg2000 if rawdata[:12] != "\x00\x00\x00\x0C\x6A\x50\x20\x20\x0D\x0A\x87\x0A":
width, height, ics = parsejp2(rawdata) error_out("cannot read input image (not jpeg2000)")
imgformat = "JPEG2000" error_out("PIL: %s"%e)
exit(1)
# image is jpeg2000
width, height, ics = parsejp2(rawdata)
imgformat = "JPEG2000"
if dpi: if dpi:
ndpi = dpi, dpi ndpi = dpi, dpi
debug_out("input dpi (forced) = %d x %d"%ndpi, verbose) debug_out("input dpi (forced) = %d x %d"%ndpi, verbose)
else:
ndpi = (96, 96) # TODO: read real dpi
debug_out("input dpi = %d x %d"%ndpi, verbose)
if colorspace:
color = colorspace
debug_out("input colorspace (forced) = %s"%(ics))
else:
color = ics
debug_out("input colorspace = %s"%(ics), verbose)
else: else:
width, height = imgdata.size ndpi = (96, 96) # TODO: read real dpi
imgformat = imgdata.format debug_out("input dpi = %d x %d"%ndpi, verbose)
if dpi: if colorspace:
ndpi = dpi, dpi color = colorspace
debug_out("input dpi (forced) = %d x %d"%ndpi, verbose) debug_out("input colorspace (forced) = %s"%(ics))
else:
ndpi = imgdata.info.get("dpi", (96, 96))
debug_out("input dpi = %d x %d"%ndpi, verbose)
if colorspace:
color = colorspace
debug_out("input colorspace (forced) = %s"%(color), verbose)
else:
color = imgdata.mode
if color == "CMYK" and imgformat == "JPEG":
# Adobe inverts CMYK JPEGs for some reason, and others
# have followed suit as well. Some software assumes the
# JPEG is inverted if the Adobe tag (APP14), while other
# software assumes all CMYK JPEGs are inverted. I don't
# have enough experience with these to know which is
# better for images currently in the wild, so I'm going
# with the first approach for now.
if "adobe" in imgdata.info:
color = "CMYK;I"
debug_out("input colorspace = %s"%(color), verbose)
debug_out("width x height = %d x %d"%(width,height), verbose)
debug_out("imgformat = %s"%imgformat, verbose)
# depending on the input format, determine whether to pass the raw
# image or the zlib compressed color information
if imgformat is "JPEG" or imgformat is "JPEG2000":
if color == '1':
error_out("jpeg can't be monochrome")
exit(1)
imgdata = rawdata
else: else:
# because we do not support /CCITTFaxDecode color = ics
if color == '1': debug_out("input colorspace = %s"%(ics), verbose)
debug_out("Converting colorspace 1 to L", verbose) else:
imgdata = imgdata.convert('L') width, height = imgdata.size
color = 'L' imgformat = imgdata.format
elif color in ("RGB", "L", "CMYK", "CMYK;I"):
debug_out("Colorspace is OK: %s"%color, verbose) if dpi:
else: ndpi = dpi, dpi
debug_out("Converting colorspace %s to RGB"%color, verbose) debug_out("input dpi (forced) = %d x %d"%ndpi, verbose)
imgdata = imgdata.convert('RGB') else:
color = imgdata.mode ndpi = imgdata.info.get("dpi", (96, 96))
imgdata = zlib.compress(imgdata.tostring()) debug_out("input dpi = %d x %d"%ndpi, verbose)
if colorspace:
color = colorspace
debug_out("input colorspace (forced) = %s"%(color), verbose)
else:
color = imgdata.mode
if color == "CMYK" and imgformat == "JPEG":
# Adobe inverts CMYK JPEGs for some reason, and others
# have followed suit as well. Some software assumes the
# JPEG is inverted if the Adobe tag (APP14), while other
# software assumes all CMYK JPEGs are inverted. I don't
# have enough experience with these to know which is
# better for images currently in the wild, so I'm going
# with the first approach for now.
if "adobe" in imgdata.info:
color = "CMYK;I"
debug_out("input colorspace = %s"%(color), verbose)
debug_out("width x height = %d x %d"%(width,height), verbose)
debug_out("imgformat = %s"%imgformat, verbose)
# depending on the input format, determine whether to pass the raw
# image or the zlib compressed color information
if imgformat is "JPEG" or imgformat is "JPEG2000":
if color == '1':
error_out("jpeg can't be monochrome")
exit(1)
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", "CMYK", "CMYK;I"):
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:

0
src/tests/test-CMYK.jpg → src/tests/input/CMYK.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

0
src/tests/test-CMYK.tif → src/tests/input/CMYK.tif
View file

0
src/tests/test.jpg → src/tests/input/normal.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

0
src/tests/test.png → src/tests/input/normal.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/tests/test.pdf
View file

Binary file not shown.

20
src/tests/test_img2pdf.py
View file

@ -1,20 +0,0 @@
import datetime
import os
import unittest
import img2pdf
HERE = os.path.dirname(__file__)
moddate = datetime.datetime(2014, 1, 1)
class TestImg2Pdf(unittest.TestCase):
def test_jpg2pdf(self):
with open(os.path.join(HERE, 'test.jpg'), 'r') as img_fp:
with open(os.path.join(HERE, 'test.pdf'), 'r') as pdf_fp:
self.assertEqual(
img2pdf.convert([img_fp], 150,
creationdate=moddate, moddate=moddate),
pdf_fp.read())
def test_png2pdf(self):
with open(os.path.join(HERE, 'test.png'), 'r') as img_fp:
self.assertRaises(SystemExit, img2pdf.convert, [img_fp], 150)