Compare commits
No commits in common. "main" and "main" have entirely different histories.
6 changed files with 232 additions and 657 deletions
16
CHANGES.rst
16
CHANGES.rst
|
|
@ -2,22 +2,6 @@
|
|||
CHANGES
|
||||
=======
|
||||
|
||||
0.5.1 (2023-11-26)
|
||||
------------------
|
||||
|
||||
- no default ICC profile location for PDF/A-1b on Windows
|
||||
- workaround for PNG input without dpi units but non-square dpi aspect ratio
|
||||
|
||||
0.5.0 (2023-10-28)
|
||||
------------------
|
||||
|
||||
- support MIFF for 16 bit CMYK input
|
||||
- accept pathlib.Path objects as input
|
||||
- don't store RGB ICC profiles from bilevel or grayscale TIFF, PNG and JPEG
|
||||
- thumbnails are no longer included by default and --include-thumbnails has to
|
||||
be used if you want them
|
||||
- support for pikepdf (>= 6.2.0)
|
||||
|
||||
0.4.4 (2022-04-07)
|
||||
------------------
|
||||
|
||||
|
|
|
|||
39
HACKING
39
HACKING
|
|
@ -27,41 +27,6 @@ Making a new release
|
|||
|
||||
- Build and upload to pypi:
|
||||
|
||||
$ rm -rf dist/*
|
||||
$ rm dist/*
|
||||
$ python3 setup.py sdist
|
||||
$ twine upload dist/*
|
||||
|
||||
Using debbisect to find regressions
|
||||
-----------------------------------
|
||||
|
||||
$ debbisect --cache=./cache --depends="git,ca-certificates,python3,
|
||||
ghostscript,imagemagick,mupdf-tools,poppler-utils,python3-pil,
|
||||
python3-pytest,python3-numpy,python3-scipy,python3-pikepdf" \
|
||||
--verbose 2023-09-16 2023-10-24 \
|
||||
'chroot "$1" sh -c "
|
||||
git clone https://gitlab.mister-muffin.de/josch/img2pdf.git
|
||||
&& cd img2pdf
|
||||
&& pytest 'src/img2pdf_test.py::test_jpg_2000_rgba8[internal]"'
|
||||
|
||||
Using debbisect cache
|
||||
---------------------
|
||||
|
||||
$ mmdebstrap --variant=apt --aptopt='Acquire::Check-Valid-Until "false"' \
|
||||
--include=git,ca-certificates,python3,ghostscript,imagemagick \
|
||||
--include=mupdf-tools,poppler-utils,python3-pil,python3-pytest \
|
||||
--include=python3-numpy,python3-scipy,python3-pikepdf \
|
||||
--hook-dir=/usr/share/mmdebstrap/hooks/file-mirror-automount \
|
||||
--setup-hook='mkdir -p "$1/home/josch/git/devscripts/cache/pool/"' \
|
||||
--setup-hook='mount -o ro,bind /home/josch/git/devscripts/cache/pool/ "$1/home/josch/git/devscripts/cache/pool/"' \
|
||||
--chrooted-customize-hook=bash
|
||||
unstable /dev/null
|
||||
file:///home/josch/git/devscripts/cache/archive/debian/20231022T090139Z/
|
||||
|
||||
Bisecting imagemagick
|
||||
---------------------
|
||||
|
||||
$ git clean -fdx && git reset --hard
|
||||
$ ./configure --prefix=$(pwd)/prefix
|
||||
$ make -j$(nproc)
|
||||
$ make install
|
||||
$ LD_LIBRARY_PATH=$(pwd)/prefix/lib prefix/bin/compare ...
|
||||
$ twine upload --sign dist/*
|
||||
|
|
|
|||
2
setup.py
2
setup.py
|
|
@ -1,7 +1,7 @@
|
|||
import sys
|
||||
from setuptools import setup
|
||||
|
||||
VERSION = "0.5.1"
|
||||
VERSION = "0.4.4"
|
||||
|
||||
INSTALL_REQUIRES = (
|
||||
"Pillow",
|
||||
|
|
|
|||
306
src/img2pdf.py
306
src/img2pdf.py
|
|
@ -22,7 +22,7 @@ import sys
|
|||
import os
|
||||
import zlib
|
||||
import argparse
|
||||
from PIL import Image, TiffImagePlugin, GifImagePlugin, ImageCms
|
||||
from PIL import Image, TiffImagePlugin, GifImagePlugin
|
||||
|
||||
if hasattr(GifImagePlugin, "LoadingStrategy"):
|
||||
# Pillow 9.0.0 started emitting all frames but the first as RGB instead of
|
||||
|
|
@ -36,8 +36,8 @@ if hasattr(GifImagePlugin, "LoadingStrategy"):
|
|||
|
||||
# TiffImagePlugin.DEBUG = True
|
||||
from PIL.ExifTags import TAGS
|
||||
from datetime import datetime, timezone
|
||||
import jp2
|
||||
from datetime import datetime
|
||||
from jp2 import parsejp2
|
||||
from enum import Enum
|
||||
from io import BytesIO
|
||||
import logging
|
||||
|
|
@ -46,7 +46,6 @@ import platform
|
|||
import hashlib
|
||||
from itertools import chain
|
||||
import re
|
||||
import io
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -62,7 +61,7 @@ try:
|
|||
except ImportError:
|
||||
have_pikepdf = False
|
||||
|
||||
__version__ = "0.5.1"
|
||||
__version__ = "0.4.4"
|
||||
default_dpi = 96.0
|
||||
papersizes = {
|
||||
"letter": "8.5inx11in",
|
||||
|
|
@ -722,7 +721,7 @@ class pdfdoc(object):
|
|||
self.writer.docinfo = PdfDict(indirect=True)
|
||||
|
||||
def datetime_to_pdfdate(dt):
|
||||
return dt.astimezone(tz=timezone.utc).strftime("%Y%m%d%H%M%SZ")
|
||||
return dt.strftime("%Y%m%d%H%M%SZ")
|
||||
|
||||
for k in ["Title", "Author", "Creator", "Producer", "Subject"]:
|
||||
v = locals()[k.lower()]
|
||||
|
|
@ -732,7 +731,7 @@ class pdfdoc(object):
|
|||
v = PdfString.encode(v)
|
||||
self.writer.docinfo[getattr(PdfName, k)] = v
|
||||
|
||||
now = datetime.now().astimezone()
|
||||
now = datetime.now()
|
||||
for k in ["CreationDate", "ModDate"]:
|
||||
v = locals()[k.lower()]
|
||||
if v is None and nodate:
|
||||
|
|
@ -752,7 +751,7 @@ class pdfdoc(object):
|
|||
)
|
||||
|
||||
def datetime_to_xmpdate(dt):
|
||||
return dt.astimezone(tz=timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
|
||||
return dt.strftime("%Y-%m-%dT%H:%M:%SZ")
|
||||
|
||||
self.xmp = b"""<?xpacket begin='\xef\xbb\xbf' id='W5M0MpCehiHzreSzNTczkc9d'?>
|
||||
<x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='XMP toolkit 2.9.1-13, framework 1.6'>
|
||||
|
|
@ -827,10 +826,8 @@ class pdfdoc(object):
|
|||
artborder=None,
|
||||
iccp=None,
|
||||
):
|
||||
assert (
|
||||
color not in [Colorspace.RGBA, Colorspace.LA]
|
||||
or (imgformat == ImageFormat.PNG and smaskdata is not None)
|
||||
or imgformat == ImageFormat.JPEG2000
|
||||
assert (color != Colorspace.RGBA and color != Colorspace.LA) or (
|
||||
imgformat == ImageFormat.PNG and smaskdata is not None
|
||||
)
|
||||
|
||||
if self.engine == Engine.pikepdf:
|
||||
|
|
@ -854,13 +851,7 @@ class pdfdoc(object):
|
|||
if color == Colorspace["1"] or color == Colorspace.L or color == Colorspace.LA:
|
||||
colorspace = PdfName.DeviceGray
|
||||
elif color == Colorspace.RGB or color == Colorspace.RGBA:
|
||||
if color == Colorspace.RGBA and imgformat == ImageFormat.JPEG2000:
|
||||
# there is no DeviceRGBA and for JPXDecode it is okay to have
|
||||
# no colorspace as the pdf reader is supposed to get this info
|
||||
# from the jpeg2000 payload itself
|
||||
colorspace = None
|
||||
else:
|
||||
colorspace = PdfName.DeviceRGB
|
||||
colorspace = PdfName.DeviceRGB
|
||||
elif color == Colorspace.CMYK or color == Colorspace["CMYK;I"]:
|
||||
colorspace = PdfName.DeviceCMYK
|
||||
elif color == Colorspace.P:
|
||||
|
|
@ -931,8 +922,7 @@ class pdfdoc(object):
|
|||
image[PdfName.Filter] = ofilter
|
||||
image[PdfName.Width] = imgwidthpx
|
||||
image[PdfName.Height] = imgheightpx
|
||||
if colorspace is not None:
|
||||
image[PdfName.ColorSpace] = colorspace
|
||||
image[PdfName.ColorSpace] = colorspace
|
||||
image[PdfName.BitsPerComponent] = depth
|
||||
|
||||
smask = None
|
||||
|
|
@ -1301,7 +1291,7 @@ def get_imgmetadata(
|
|||
if imgformat == ImageFormat.JPEG2000 and rawdata is not None and imgdata is None:
|
||||
# this codepath gets called if the PIL installation is not able to
|
||||
# handle JPEG2000 files
|
||||
imgwidthpx, imgheightpx, ics, hdpi, vdpi, channels, bpp = jp2.parse(rawdata)
|
||||
imgwidthpx, imgheightpx, ics, hdpi, vdpi = parsejp2(rawdata)
|
||||
|
||||
if hdpi is None:
|
||||
hdpi = default_dpi
|
||||
|
|
@ -1311,19 +1301,7 @@ def get_imgmetadata(
|
|||
else:
|
||||
imgwidthpx, imgheightpx = imgdata.size
|
||||
|
||||
ndpi = imgdata.info.get("dpi")
|
||||
if ndpi is None:
|
||||
# the PNG plugin of PIL adds the undocumented "aspect" field instead of
|
||||
# the "dpi" field if the PNG pHYs chunk unit is not set to meters
|
||||
if imgformat == ImageFormat.PNG and imgdata.info.get("aspect") is not None:
|
||||
aspect = imgdata.info["aspect"]
|
||||
# make sure not to go below the default dpi
|
||||
if aspect[0] > aspect[1]:
|
||||
ndpi = (default_dpi * aspect[0] / aspect[1], default_dpi)
|
||||
else:
|
||||
ndpi = (default_dpi, default_dpi * aspect[1] / aspect[0])
|
||||
else:
|
||||
ndpi = (default_dpi, default_dpi)
|
||||
ndpi = imgdata.info.get("dpi", (default_dpi, default_dpi))
|
||||
# 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
|
||||
|
|
@ -1333,7 +1311,7 @@ def get_imgmetadata(
|
|||
ics = imgdata.mode
|
||||
|
||||
# GIF and PNG files with transparency are supported
|
||||
if imgformat in [ImageFormat.PNG, ImageFormat.GIF, ImageFormat.JPEG2000] and (
|
||||
if (imgformat == ImageFormat.PNG or imgformat == ImageFormat.GIF) and (
|
||||
ics in ["RGBA", "LA"] or "transparency" in imgdata.info
|
||||
):
|
||||
# Must check the IHDR chunk for the bit depth, because PIL would lossily
|
||||
|
|
@ -1343,10 +1321,6 @@ def get_imgmetadata(
|
|||
if depth > 8:
|
||||
logger.warning("Image with transparency and a bit depth of %d." % depth)
|
||||
logger.warning("This is unsupported due to PIL limitations.")
|
||||
logger.warning(
|
||||
"If you accept a lossy conversion, you can manually convert "
|
||||
"your images to 8 bit using `convert -depth 8` from imagemagick"
|
||||
)
|
||||
raise AlphaChannelError(
|
||||
"Refusing to work with multiple >8bit channels."
|
||||
)
|
||||
|
|
@ -1457,53 +1431,6 @@ def get_imgmetadata(
|
|||
iccp = None
|
||||
if "icc_profile" in imgdata.info:
|
||||
iccp = imgdata.info.get("icc_profile")
|
||||
# GIMP saves bilevel TIFF images and palette PNG images with only black and
|
||||
# white in the palette with an RGB ICC profile which is useless
|
||||
# https://gitlab.gnome.org/GNOME/gimp/-/issues/3438
|
||||
# and produces an error in Adobe Acrobat, so we ignore it with a warning.
|
||||
# imagemagick also used to (wrongly) include an RGB ICC profile for bilevel
|
||||
# images: https://github.com/ImageMagick/ImageMagick/issues/2070
|
||||
if iccp is not None and (
|
||||
(color == Colorspace["1"] and imgformat == ImageFormat.TIFF)
|
||||
or (
|
||||
imgformat == ImageFormat.PNG
|
||||
and color == Colorspace.P
|
||||
and rawdata is not None
|
||||
and parse_png(rawdata)[1]
|
||||
in [b"\x00\x00\x00\xff\xff\xff", b"\xff\xff\xff\x00\x00\x00"]
|
||||
)
|
||||
):
|
||||
with io.BytesIO(iccp) as f:
|
||||
prf = ImageCms.ImageCmsProfile(f)
|
||||
if (
|
||||
prf.profile.model == "sRGB"
|
||||
and prf.profile.manufacturer == "GIMP"
|
||||
and prf.profile.profile_description == "GIMP built-in sRGB"
|
||||
):
|
||||
if imgformat == ImageFormat.TIFF:
|
||||
logger.warning(
|
||||
"Ignoring RGB ICC profile in bilevel TIFF produced by GIMP."
|
||||
)
|
||||
elif imgformat == ImageFormat.PNG:
|
||||
logger.warning(
|
||||
"Ignoring RGB ICC profile in 2-color palette PNG produced by GIMP."
|
||||
)
|
||||
logger.warning("https://gitlab.gnome.org/GNOME/gimp/-/issues/3438")
|
||||
iccp = None
|
||||
# SmartAlbums old version (found 2.2.6) exports JPG with only 1 compone
|
||||
# with an RGB ICC profile which is useless.
|
||||
# This produces an error in Adobe Acrobat, so we ignore it with a warning.
|
||||
# Update: Found another case, the JPG is created by Adobe PhotoShop, so we
|
||||
# don't check software anymore.
|
||||
if iccp is not None and (
|
||||
(color == Colorspace["L"] and imgformat == ImageFormat.JPEG)
|
||||
):
|
||||
with io.BytesIO(iccp) as f:
|
||||
prf = ImageCms.ImageCmsProfile(f)
|
||||
|
||||
if prf.profile.xcolor_space not in ("GRAY"):
|
||||
logger.warning("Ignoring non-GRAY ICC profile in Grayscale JPG")
|
||||
iccp = None
|
||||
|
||||
logger.debug("width x height = %dpx x %dpx", imgwidthpx, imgheightpx)
|
||||
|
||||
|
|
@ -1722,7 +1649,7 @@ def parse_miff(data):
|
|||
elif hdata["colorspace"] == "Gray":
|
||||
numchannels = 1
|
||||
colorspace = Colorspace.L
|
||||
if hdata.get("matte"):
|
||||
if hdata["matte"]:
|
||||
numchannels += 1
|
||||
if hdata.get("profile"):
|
||||
# there is no key encoding the length of icc or exif data
|
||||
|
|
@ -1772,7 +1699,7 @@ def parse_miff(data):
|
|||
# case "PseudoClass":
|
||||
elif hdata["class"] == "PseudoClass":
|
||||
assert "colors" in hdata
|
||||
if hdata.get("matte"):
|
||||
if hdata["matte"]:
|
||||
numchannels = 2
|
||||
else:
|
||||
numchannels = 1
|
||||
|
|
@ -1807,9 +1734,7 @@ def parse_miff(data):
|
|||
# fmt: on
|
||||
|
||||
|
||||
def read_images(
|
||||
rawdata, colorspace, first_frame_only=False, rot=None, include_thumbnails=False
|
||||
):
|
||||
def read_images(rawdata, colorspace, first_frame_only=False, rot=None):
|
||||
im = BytesIO(rawdata)
|
||||
im.seek(0)
|
||||
imgdata = None
|
||||
|
|
@ -1863,13 +1788,10 @@ def read_images(
|
|||
raise JpegColorspaceError("jpeg can't be monochrome")
|
||||
if color == Colorspace["P"]:
|
||||
raise JpegColorspaceError("jpeg can't have a color palette")
|
||||
if color == Colorspace["RGBA"] and imgformat != ImageFormat.JPEG2000:
|
||||
if color == Colorspace["RGBA"]:
|
||||
raise JpegColorspaceError("jpeg can't have an alpha channel")
|
||||
logger.debug("read_images() embeds a JPEG")
|
||||
cleanup()
|
||||
depth = 8
|
||||
if imgformat == ImageFormat.JPEG2000:
|
||||
*_, depth = jp2.parse(rawdata)
|
||||
return [
|
||||
(
|
||||
color,
|
||||
|
|
@ -1881,7 +1803,7 @@ def read_images(
|
|||
imgheightpx,
|
||||
[],
|
||||
False,
|
||||
depth,
|
||||
8,
|
||||
rotation,
|
||||
iccp,
|
||||
)
|
||||
|
|
@ -1898,77 +1820,6 @@ def read_images(
|
|||
if imgformat == ImageFormat.MPO:
|
||||
result = []
|
||||
img_page_count = 0
|
||||
assert len(imgdata._MpoImageFile__mpoffsets) == len(imgdata.mpinfo[0xB002])
|
||||
num_frames = len(imgdata.mpinfo[0xB002])
|
||||
# An MPO file can be a main image together with one or more thumbnails
|
||||
# if that is the case, then we only include all frames if the
|
||||
# --include-thumbnails option is given. If it is not, such an MPO file
|
||||
# will be embedded as is, so including its thumbnails but showing up
|
||||
# as a single image page in the resulting PDF.
|
||||
num_main_frames = 0
|
||||
num_thumbnail_frames = 0
|
||||
for i, mpent in enumerate(imgdata.mpinfo[0xB002]):
|
||||
# check only the first frame for being the main image
|
||||
if (
|
||||
i == 0
|
||||
and mpent["Attribute"]["DependentParentImageFlag"]
|
||||
and not mpent["Attribute"]["DependentChildImageFlag"]
|
||||
and mpent["Attribute"]["RepresentativeImageFlag"]
|
||||
and mpent["Attribute"]["MPType"] == "Baseline MP Primary Image"
|
||||
):
|
||||
num_main_frames += 1
|
||||
elif (
|
||||
not mpent["Attribute"]["DependentParentImageFlag"]
|
||||
and mpent["Attribute"]["DependentChildImageFlag"]
|
||||
and not mpent["Attribute"]["RepresentativeImageFlag"]
|
||||
and mpent["Attribute"]["MPType"]
|
||||
in [
|
||||
"Large Thumbnail (VGA Equivalent)",
|
||||
"Large Thumbnail (Full HD Equivalent)",
|
||||
]
|
||||
):
|
||||
num_thumbnail_frames += 1
|
||||
logger.debug(f"number of frames: {num_frames}")
|
||||
logger.debug(f"number of main frames: {num_main_frames}")
|
||||
logger.debug(f"number of thumbnail frames: {num_thumbnail_frames}")
|
||||
# this MPO file is a main image plus zero or more thumbnails
|
||||
# embed as-is unless the --include-thumbnails option was given
|
||||
if num_frames == 1 or (
|
||||
not include_thumbnails
|
||||
and num_main_frames == 1
|
||||
and num_thumbnail_frames + 1 == num_frames
|
||||
):
|
||||
color, ndpi, imgwidthpx, imgheightpx, rotation, iccp = get_imgmetadata(
|
||||
imgdata, imgformat, default_dpi, colorspace, rawdata, rot
|
||||
)
|
||||
if color == Colorspace["1"]:
|
||||
raise JpegColorspaceError("jpeg can't be monochrome")
|
||||
if color == Colorspace["P"]:
|
||||
raise JpegColorspaceError("jpeg can't have a color palette")
|
||||
if color == Colorspace["RGBA"]:
|
||||
raise JpegColorspaceError("jpeg can't have an alpha channel")
|
||||
logger.debug("read_images() embeds an MPO verbatim")
|
||||
cleanup()
|
||||
return [
|
||||
(
|
||||
color,
|
||||
ndpi,
|
||||
ImageFormat.JPEG,
|
||||
rawdata,
|
||||
None,
|
||||
imgwidthpx,
|
||||
imgheightpx,
|
||||
[],
|
||||
False,
|
||||
8,
|
||||
rotation,
|
||||
iccp,
|
||||
)
|
||||
]
|
||||
# If the control flow reaches here, the MPO has more than a single
|
||||
# frame but was not detected to be a main image followed by multiple
|
||||
# thumbnails. We thus treat this MPO as we do other multi-frame images
|
||||
# and include all its frames as individual pages.
|
||||
for offset, mpent in zip(
|
||||
imgdata._MpoImageFile__mpoffsets, imgdata.mpinfo[0xB002]
|
||||
):
|
||||
|
|
@ -2234,16 +2085,7 @@ def read_images(
|
|||
)
|
||||
)
|
||||
else:
|
||||
if color in [Colorspace.P, Colorspace.PA] and iccp is not None:
|
||||
# PDF does not support palette images with icc profile
|
||||
if color == Colorspace.P:
|
||||
newcolor = Colorspace.RGB
|
||||
newimg = newimg.convert(mode="RGB")
|
||||
elif color == Colorspace.PA:
|
||||
newcolor = Colorspace.RGBA
|
||||
newimg = newimg.convert(mode="RGBA")
|
||||
smaskidat = None
|
||||
elif (
|
||||
if (
|
||||
color == Colorspace.RGBA
|
||||
or color == Colorspace.LA
|
||||
or color == Colorspace.PA
|
||||
|
|
@ -2257,21 +2099,25 @@ def read_images(
|
|||
newcolor = color
|
||||
l, a = newimg.split()
|
||||
newimg = l
|
||||
elif color == Colorspace.PA or (
|
||||
color == Colorspace.P and "transparency" in newimg.info
|
||||
):
|
||||
newcolor = color
|
||||
a = newimg.convert(mode="RGBA").split()[-1]
|
||||
else:
|
||||
newcolor = Colorspace.RGBA
|
||||
r, g, b, a = newimg.convert(mode="RGBA").split()
|
||||
newimg = Image.merge("RGB", (r, g, b))
|
||||
|
||||
smaskidat, *_ = to_png_data(a)
|
||||
smaskidat, _, _ = to_png_data(a)
|
||||
logger.warning(
|
||||
"Image contains an alpha channel. Computing a separate "
|
||||
"soft mask (/SMask) image to store transparency in PDF."
|
||||
)
|
||||
elif color in [Colorspace.P, Colorspace.PA] and iccp is not None:
|
||||
# PDF does not support palette images with icc profile
|
||||
if color == Colorspace.P:
|
||||
newcolor = Colorspace.RGB
|
||||
newimg = newimg.convert(mode="RGB")
|
||||
elif color == Colorspace.PA:
|
||||
newcolor = Colorspace.RGBA
|
||||
newimg = newimg.convert(mode="RGBA")
|
||||
smaskidat = None
|
||||
else:
|
||||
newcolor = color
|
||||
smaskidat = None
|
||||
|
|
@ -2642,7 +2488,6 @@ def convert(*images, **kwargs):
|
|||
artborder=None,
|
||||
pdfa=None,
|
||||
rotation=None,
|
||||
include_thumbnails=False,
|
||||
)
|
||||
for kwname, default in _default_kwargs.items():
|
||||
if kwname not in kwargs:
|
||||
|
|
@ -2735,7 +2580,6 @@ def convert(*images, **kwargs):
|
|||
kwargs["colorspace"],
|
||||
kwargs["first_frame_only"],
|
||||
kwargs["rotation"],
|
||||
kwargs["include_thumbnails"],
|
||||
):
|
||||
pagewidth, pageheight, imgwidthpdf, imgheightpdf = kwargs["layout_fun"](
|
||||
imgwidthpx, imgheightpx, ndpi
|
||||
|
|
@ -3111,7 +2955,7 @@ def valid_date(string):
|
|||
else:
|
||||
try:
|
||||
return parser.parse(string)
|
||||
except:
|
||||
except TypeError:
|
||||
pass
|
||||
# as a last resort, try the local date utility
|
||||
try:
|
||||
|
|
@ -3124,7 +2968,7 @@ def valid_date(string):
|
|||
except subprocess.CalledProcessError:
|
||||
pass
|
||||
else:
|
||||
return datetime.fromtimestamp(int(utime))
|
||||
return datetime.utcfromtimestamp(int(utime))
|
||||
raise argparse.ArgumentTypeError("cannot parse date: %s" % string)
|
||||
|
||||
|
||||
|
|
@ -3826,35 +3670,7 @@ def gui():
|
|||
app.mainloop()
|
||||
|
||||
|
||||
def file_is_icc(fname):
|
||||
with open(fname, "rb") as f:
|
||||
data = f.read(40)
|
||||
if len(data) < 40:
|
||||
return False
|
||||
return data[36:] == b"acsp"
|
||||
|
||||
|
||||
def validate_icc(fname):
|
||||
if not file_is_icc(fname):
|
||||
raise argparse.ArgumentTypeError('"%s" is not an ICC profile' % fname)
|
||||
return fname
|
||||
|
||||
|
||||
def get_default_icc_profile():
|
||||
for profile in [
|
||||
"/usr/share/color/icc/sRGB.icc",
|
||||
"/usr/share/color/icc/OpenICC/sRGB.icc",
|
||||
"/usr/share/color/icc/colord/sRGB.icc",
|
||||
]:
|
||||
if not os.path.exists(profile):
|
||||
continue
|
||||
if not file_is_icc(profile):
|
||||
continue
|
||||
return profile
|
||||
return "/usr/share/color/icc/sRGB.icc"
|
||||
|
||||
|
||||
def get_main_parser():
|
||||
def main(argv=sys.argv):
|
||||
rendered_papersizes = ""
|
||||
for k, v in sorted(papersizes.items()):
|
||||
rendered_papersizes += " %-8s %s\n" % (papernames[k], v)
|
||||
|
|
@ -3895,9 +3711,7 @@ Paper sizes:
|
|||
the value in the second column has the same effect as giving the short hand
|
||||
in the first column. Appending ^T (a caret/circumflex followed by the letter
|
||||
T) turns the paper size from portrait into landscape. The postfix thus
|
||||
symbolizes the transpose. Note that on Windows cmd.exe the caret symbol is
|
||||
the escape character, so you need to put quotes around the option value.
|
||||
The values are case insensitive.
|
||||
symbolizes the transpose. The values are case insensitive.
|
||||
|
||||
%s
|
||||
|
||||
|
|
@ -3964,7 +3778,7 @@ Examples:
|
|||
while preserving its aspect ratio and a print border of 2 cm on the top and
|
||||
bottom and 2.5 cm on the left and right hand side.
|
||||
|
||||
$ img2pdf --output out.pdf --pagesize "A4^T" --border 2cm:2.5cm *.jpg
|
||||
$ img2pdf --output out.pdf --pagesize A4^T --border 2cm:2.5cm *.jpg
|
||||
|
||||
On each A4 page, fit images into a 10 cm times 15 cm rectangle but keep the
|
||||
original image size if the image is smaller than that.
|
||||
|
|
@ -4099,17 +3913,6 @@ RGB.""",
|
|||
"input image be converted into a page in the resulting PDF.",
|
||||
)
|
||||
|
||||
outargs.add_argument(
|
||||
"--include-thumbnails",
|
||||
action="store_true",
|
||||
help="Some multi-frame formats like MPO carry a main image and "
|
||||
"one or more scaled-down copies of the main image (thumbnails). "
|
||||
"In such a case, img2pdf will only include the main image and "
|
||||
"not create additional pages for each of the thumbnails. If this "
|
||||
"option is set, img2pdf will instead create one page per frame and "
|
||||
"thus store each thumbnail on its own page.",
|
||||
)
|
||||
|
||||
outargs.add_argument(
|
||||
"--pillow-limit-break",
|
||||
action="store_true",
|
||||
|
|
@ -4121,29 +3924,14 @@ RGB.""",
|
|||
% Image.MAX_IMAGE_PIXELS,
|
||||
)
|
||||
|
||||
if sys.platform == "win32":
|
||||
# on Windows, there are no default paths to search for an ICC profile
|
||||
# so make the argument required instead of optional
|
||||
outargs.add_argument(
|
||||
"--pdfa",
|
||||
type=validate_icc,
|
||||
help="Output a PDF/A-1b compliant document. The argument to this "
|
||||
"option is the path to the ICC profile that will be embedded into "
|
||||
"the resulting PDF.",
|
||||
)
|
||||
else:
|
||||
outargs.add_argument(
|
||||
"--pdfa",
|
||||
nargs="?",
|
||||
const=get_default_icc_profile(),
|
||||
default=None,
|
||||
type=validate_icc,
|
||||
help="Output a PDF/A-1b compliant document. By default, this will "
|
||||
"embed either /usr/share/color/icc/sRGB.icc, "
|
||||
"/usr/share/color/icc/OpenICC/sRGB.icc or "
|
||||
"/usr/share/color/icc/colord/sRGB.icc as the color profile, whichever "
|
||||
"is found to exist first.",
|
||||
)
|
||||
outargs.add_argument(
|
||||
"--pdfa",
|
||||
nargs="?",
|
||||
const="/usr/share/color/icc/sRGB.icc",
|
||||
default=None,
|
||||
help="Output a PDF/A-1b compliant document. By default, this will "
|
||||
"embed /usr/share/color/icc/sRGB.icc as the color profile.",
|
||||
)
|
||||
|
||||
sizeargs = parser.add_argument_group(
|
||||
title="Image and page size and layout arguments",
|
||||
|
|
@ -4432,11 +4220,8 @@ and left/right, respectively. It is not possible to specify asymmetric borders.
|
|||
action="store_true",
|
||||
help="Instruct the PDF viewer to open the PDF in fullscreen mode",
|
||||
)
|
||||
return parser
|
||||
|
||||
|
||||
def main(argv=sys.argv):
|
||||
args = get_main_parser().parse_args(argv[1:])
|
||||
args = parser.parse_args(argv[1:])
|
||||
|
||||
if args.verbose:
|
||||
logging.basicConfig(level=logging.DEBUG)
|
||||
|
|
@ -4463,7 +4248,7 @@ def main(argv=sys.argv):
|
|||
print(
|
||||
"Reading image from standard input...\n"
|
||||
"Re-run with -h or --help for usage information.",
|
||||
file=sys.stderr,
|
||||
file=sys.stderr
|
||||
)
|
||||
try:
|
||||
images = [sys.stdin.buffer.read()]
|
||||
|
|
@ -4525,7 +4310,6 @@ def main(argv=sys.argv):
|
|||
artborder=args.art_border,
|
||||
pdfa=args.pdfa,
|
||||
rotation=args.rotation,
|
||||
include_thumbnails=args.include_thumbnails,
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error("error: " + str(e))
|
||||
|
|
|
|||
|
|
@ -19,8 +19,6 @@ from packaging.version import parse as parse_version
|
|||
import warnings
|
||||
import json
|
||||
import pathlib
|
||||
import itertools
|
||||
import xml.etree.ElementTree as ET
|
||||
|
||||
img2pdfprog = os.getenv("img2pdfprog", default="src/img2pdf.py")
|
||||
|
||||
|
|
@ -39,14 +37,6 @@ for glob in ICC_PROFILE_PATHS:
|
|||
ICC_PROFILE = path
|
||||
break
|
||||
|
||||
HAVE_FAKETIME = True
|
||||
try:
|
||||
ver = subprocess.check_output(["faketime", "--version"])
|
||||
if b"faketime: Version " not in ver:
|
||||
HAVE_FAKETIME = False
|
||||
except FileNotFoundError:
|
||||
HAVE_FAKETIME = False
|
||||
|
||||
HAVE_MUTOOL = True
|
||||
try:
|
||||
ver = subprocess.check_output(["mutool", "-v"], stderr=subprocess.STDOUT)
|
||||
|
|
@ -140,25 +130,6 @@ psnr_re = re.compile(rb"((?:inf|(?:0|[1-9][0-9]*)(?:\.[0-9]+)?))(?: \([0-9.]+\))
|
|||
###############################################################################
|
||||
|
||||
|
||||
# Interpret a datetime string in a given timezone and format it according to a
|
||||
# given format string in in UTC.
|
||||
# We avoid using the Python datetime module for this job because doing so would
|
||||
# just replicate the code we want to test for correctness.
|
||||
def tz2utcstrftime(string, fmt, timezone):
|
||||
return (
|
||||
subprocess.check_output(
|
||||
[
|
||||
"date",
|
||||
"--utc",
|
||||
f'--date=TZ="{timezone}" {string}',
|
||||
f"+{fmt}",
|
||||
]
|
||||
)
|
||||
.decode("utf8")
|
||||
.removesuffix("\n")
|
||||
)
|
||||
|
||||
|
||||
def find_closest_palette_color(color, palette):
|
||||
if color.ndim == 0:
|
||||
idx = (numpy.abs(palette - color)).argmin()
|
||||
|
|
@ -361,8 +332,6 @@ def compare(im1, im2, exact, icc, cmyk):
|
|||
+ [
|
||||
"-metric",
|
||||
"AE",
|
||||
"-alpha",
|
||||
"off",
|
||||
im1,
|
||||
im2,
|
||||
"null:",
|
||||
|
|
@ -634,7 +603,7 @@ def alpha_value():
|
|||
alpha = numpy.zeros((60, 60, 4), dtype=numpy.dtype("int64"))
|
||||
|
||||
# draw three circles
|
||||
for xpos, ypos, color in [
|
||||
for (xpos, ypos, color) in [
|
||||
(12, 3, [0xFFFF, 0, 0, 0xFFFF]),
|
||||
(21, 21, [0, 0xFFFF, 0, 0xFFFF]),
|
||||
(3, 21, [0, 0, 0xFFFF, 0xFFFF]),
|
||||
|
|
@ -1218,74 +1187,6 @@ def jpg_2000_img(tmp_path_factory, tmp_normal_png):
|
|||
in_img.unlink()
|
||||
|
||||
|
||||
@pytest.fixture(scope="session")
|
||||
def jpg_2000_rgba8_img(tmp_path_factory, tmp_alpha_png):
|
||||
in_img = tmp_path_factory.mktemp("jpg_2000_rgba8") / "in.jp2"
|
||||
subprocess.check_call(CONVERT + [str(tmp_alpha_png), "-depth", "8", str(in_img)])
|
||||
identify = json.loads(subprocess.check_output(CONVERT + [str(in_img), "json:"]))
|
||||
assert len(identify) == 1
|
||||
# somewhere between imagemagick 6.9.7.4 and 6.9.9.34, the json output was
|
||||
# put into an array, here we cater for the older version containing just
|
||||
# the bare dictionary
|
||||
if "image" in identify:
|
||||
identify = [identify]
|
||||
assert "image" in identify[0]
|
||||
assert identify[0]["image"].get("format") == "JP2", str(identify)
|
||||
assert identify[0]["image"].get("mimeType") == "image/jp2", str(identify)
|
||||
assert identify[0]["image"].get("geometry") == {
|
||||
"width": 60,
|
||||
"height": 60,
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
|
||||
assert identify[0]["image"].get("type") == "TrueColorAlpha", str(identify)
|
||||
assert identify[0]["image"].get("depth") == 8, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
"width": 60,
|
||||
"height": 60,
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
}, str(identify)
|
||||
assert identify[0]["image"].get("compression") == "JPEG2000", str(identify)
|
||||
yield in_img
|
||||
in_img.unlink()
|
||||
|
||||
|
||||
@pytest.fixture(scope="session")
|
||||
def jpg_2000_rgba16_img(tmp_path_factory, tmp_alpha_png):
|
||||
in_img = tmp_path_factory.mktemp("jpg_2000_rgba16") / "in.jp2"
|
||||
subprocess.check_call(CONVERT + [str(tmp_alpha_png), str(in_img)])
|
||||
identify = json.loads(subprocess.check_output(CONVERT + [str(in_img), "json:"]))
|
||||
assert len(identify) == 1
|
||||
# somewhere between imagemagick 6.9.7.4 and 6.9.9.34, the json output was
|
||||
# put into an array, here we cater for the older version containing just
|
||||
# the bare dictionary
|
||||
if "image" in identify:
|
||||
identify = [identify]
|
||||
assert "image" in identify[0]
|
||||
assert identify[0]["image"].get("format") == "JP2", str(identify)
|
||||
assert identify[0]["image"].get("mimeType") == "image/jp2", str(identify)
|
||||
assert identify[0]["image"].get("geometry") == {
|
||||
"width": 60,
|
||||
"height": 60,
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
|
||||
assert identify[0]["image"].get("type") == "TrueColorAlpha", str(identify)
|
||||
assert identify[0]["image"].get("depth") == 16, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
"width": 60,
|
||||
"height": 60,
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
}, str(identify)
|
||||
assert identify[0]["image"].get("compression") == "JPEG2000", str(identify)
|
||||
yield in_img
|
||||
in_img.unlink()
|
||||
|
||||
|
||||
@pytest.fixture(scope="session")
|
||||
def png_rgb8_img(tmp_normal_png):
|
||||
in_img = tmp_normal_png
|
||||
|
|
@ -1698,7 +1599,7 @@ def png_gray1_img(tmp_path_factory, tmp_gray1_png):
|
|||
"y": 0,
|
||||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
|
||||
assert identify[0]["image"].get("type") in ["Bilevel", "Grayscale"], str(identify)
|
||||
assert identify[0]["image"].get("type") == "Bilevel", str(identify)
|
||||
assert identify[0]["image"].get("depth") == 1, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
"width": 60,
|
||||
|
|
@ -2429,6 +2330,10 @@ def tiff_float_img(tmp_path_factory, tmp_normal_png):
|
|||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
|
||||
assert identify[0]["image"].get("type") == "TrueColor", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("depth") == 8, str(identify)
|
||||
assert identify[0]["image"].get("baseDepth") == 32, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
|
|
@ -2444,6 +2349,9 @@ def tiff_float_img(tmp_path_factory, tmp_normal_png):
|
|||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified"
|
||||
), str(identify)
|
||||
assert identify[0]["image"].get("properties", {}).get("tiff:endian") == "lsb", str(
|
||||
identify
|
||||
)
|
||||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:photometric") == "RGB"
|
||||
), str(identify)
|
||||
|
|
@ -2483,6 +2391,10 @@ def tiff_cmyk8_img(tmp_path_factory, tmp_normal_png):
|
|||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "CMYK", str(identify)
|
||||
assert identify[0]["image"].get("type") == "ColorSeparation", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("depth") == 8, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
"width": 60,
|
||||
|
|
@ -2493,6 +2405,9 @@ def tiff_cmyk8_img(tmp_path_factory, tmp_normal_png):
|
|||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified"
|
||||
), str(identify)
|
||||
assert identify[0]["image"].get("properties", {}).get("tiff:endian") == "lsb", str(
|
||||
identify
|
||||
)
|
||||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:photometric")
|
||||
== "separated"
|
||||
|
|
@ -2535,6 +2450,10 @@ def tiff_cmyk16_img(tmp_path_factory, tmp_normal_png):
|
|||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "CMYK", str(identify)
|
||||
assert identify[0]["image"].get("type") == "ColorSeparation", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("depth") == 16, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
"width": 60,
|
||||
|
|
@ -2545,6 +2464,9 @@ def tiff_cmyk16_img(tmp_path_factory, tmp_normal_png):
|
|||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified"
|
||||
), str(identify)
|
||||
assert identify[0]["image"].get("properties", {}).get("tiff:endian") == "lsb", str(
|
||||
identify
|
||||
)
|
||||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:photometric")
|
||||
== "separated"
|
||||
|
|
@ -2577,6 +2499,10 @@ def tiff_rgb8_img(tmp_path_factory, tmp_normal_png):
|
|||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
|
||||
assert identify[0]["image"].get("type") == "TrueColor", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("depth") == 8, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
"width": 60,
|
||||
|
|
@ -2587,6 +2513,9 @@ def tiff_rgb8_img(tmp_path_factory, tmp_normal_png):
|
|||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified"
|
||||
), str(identify)
|
||||
assert identify[0]["image"].get("properties", {}).get("tiff:endian") == "lsb", str(
|
||||
identify
|
||||
)
|
||||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:photometric") == "RGB"
|
||||
), str(identify)
|
||||
|
|
@ -2626,6 +2555,10 @@ def tiff_rgb12_img(tmp_path_factory, tmp_normal16_png):
|
|||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
|
||||
assert identify[0]["image"].get("type") == "TrueColor", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("baseDepth") == 12, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
"width": 60,
|
||||
|
|
@ -2636,6 +2569,9 @@ def tiff_rgb12_img(tmp_path_factory, tmp_normal16_png):
|
|||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified"
|
||||
), str(identify)
|
||||
assert identify[0]["image"].get("properties", {}).get("tiff:endian") == "lsb", str(
|
||||
identify
|
||||
)
|
||||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:photometric") == "RGB"
|
||||
), str(identify)
|
||||
|
|
@ -2675,6 +2611,10 @@ def tiff_rgb14_img(tmp_path_factory, tmp_normal16_png):
|
|||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
|
||||
assert identify[0]["image"].get("type") == "TrueColor", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("baseDepth") == 14, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
"width": 60,
|
||||
|
|
@ -2685,6 +2625,9 @@ def tiff_rgb14_img(tmp_path_factory, tmp_normal16_png):
|
|||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified"
|
||||
), str(identify)
|
||||
assert identify[0]["image"].get("properties", {}).get("tiff:endian") == "lsb", str(
|
||||
identify
|
||||
)
|
||||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:photometric") == "RGB"
|
||||
), str(identify)
|
||||
|
|
@ -2724,6 +2667,10 @@ def tiff_rgb16_img(tmp_path_factory, tmp_normal16_png):
|
|||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
|
||||
assert identify[0]["image"].get("type") == "TrueColor", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("depth") == 16, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
"width": 60,
|
||||
|
|
@ -2734,6 +2681,9 @@ def tiff_rgb16_img(tmp_path_factory, tmp_normal16_png):
|
|||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified"
|
||||
), str(identify)
|
||||
assert identify[0]["image"].get("properties", {}).get("tiff:endian") == "lsb", str(
|
||||
identify
|
||||
)
|
||||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:photometric") == "RGB"
|
||||
), str(identify)
|
||||
|
|
@ -2774,6 +2724,10 @@ def tiff_rgba8_img(tmp_path_factory, tmp_alpha_png):
|
|||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
|
||||
assert identify[0]["image"].get("type") == "TrueColorAlpha", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("depth") == 8, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
"width": 60,
|
||||
|
|
@ -2784,6 +2738,9 @@ def tiff_rgba8_img(tmp_path_factory, tmp_alpha_png):
|
|||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unassociated"
|
||||
), str(identify)
|
||||
assert identify[0]["image"].get("properties", {}).get("tiff:endian") == "lsb", str(
|
||||
identify
|
||||
)
|
||||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:photometric") == "RGB"
|
||||
), str(identify)
|
||||
|
|
@ -2824,6 +2781,10 @@ def tiff_rgba16_img(tmp_path_factory, tmp_alpha_png):
|
|||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
|
||||
assert identify[0]["image"].get("type") == "TrueColorAlpha", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("depth") == 16, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
"width": 60,
|
||||
|
|
@ -2834,6 +2795,9 @@ def tiff_rgba16_img(tmp_path_factory, tmp_alpha_png):
|
|||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unassociated"
|
||||
), str(identify)
|
||||
assert identify[0]["image"].get("properties", {}).get("tiff:endian") == "lsb", str(
|
||||
identify
|
||||
)
|
||||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:photometric") == "RGB"
|
||||
), str(identify)
|
||||
|
|
@ -2873,6 +2837,10 @@ def tiff_gray1_img(tmp_path_factory, tmp_gray1_png):
|
|||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
|
||||
assert identify[0]["image"].get("type") == "Bilevel", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("depth") == 1, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
"width": 60,
|
||||
|
|
@ -2883,6 +2851,9 @@ def tiff_gray1_img(tmp_path_factory, tmp_gray1_png):
|
|||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified"
|
||||
), str(identify)
|
||||
assert identify[0]["image"].get("properties", {}).get("tiff:endian") == "lsb", str(
|
||||
identify
|
||||
)
|
||||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:photometric")
|
||||
== "min-is-black"
|
||||
|
|
@ -2923,6 +2894,10 @@ def tiff_gray2_img(tmp_path_factory, tmp_gray2_png):
|
|||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
|
||||
assert identify[0]["image"].get("type") == "Grayscale", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("depth") == 2, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
"width": 60,
|
||||
|
|
@ -2933,6 +2908,9 @@ def tiff_gray2_img(tmp_path_factory, tmp_gray2_png):
|
|||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified"
|
||||
), str(identify)
|
||||
assert identify[0]["image"].get("properties", {}).get("tiff:endian") == "lsb", str(
|
||||
identify
|
||||
)
|
||||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:photometric")
|
||||
== "min-is-black"
|
||||
|
|
@ -2973,6 +2951,10 @@ def tiff_gray4_img(tmp_path_factory, tmp_gray4_png):
|
|||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
|
||||
assert identify[0]["image"].get("type") == "Grayscale", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("depth") == 4, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
"width": 60,
|
||||
|
|
@ -2983,6 +2965,9 @@ def tiff_gray4_img(tmp_path_factory, tmp_gray4_png):
|
|||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified"
|
||||
), str(identify)
|
||||
assert identify[0]["image"].get("properties", {}).get("tiff:endian") == "lsb", str(
|
||||
identify
|
||||
)
|
||||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:photometric")
|
||||
== "min-is-black"
|
||||
|
|
@ -3023,6 +3008,10 @@ def tiff_gray8_img(tmp_path_factory, tmp_gray8_png):
|
|||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
|
||||
assert identify[0]["image"].get("type") == "Grayscale", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("depth") == 8, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
"width": 60,
|
||||
|
|
@ -3033,6 +3022,9 @@ def tiff_gray8_img(tmp_path_factory, tmp_gray8_png):
|
|||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified"
|
||||
), str(identify)
|
||||
assert identify[0]["image"].get("properties", {}).get("tiff:endian") == "lsb", str(
|
||||
identify
|
||||
)
|
||||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:photometric")
|
||||
== "min-is-black"
|
||||
|
|
@ -3073,6 +3065,10 @@ def tiff_gray16_img(tmp_path_factory, tmp_gray16_png):
|
|||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
|
||||
assert identify[0]["image"].get("type") == "Grayscale", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("depth") == 16, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
"width": 60,
|
||||
|
|
@ -3083,6 +3079,9 @@ def tiff_gray16_img(tmp_path_factory, tmp_gray16_png):
|
|||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified"
|
||||
), str(identify)
|
||||
assert identify[0]["image"].get("properties", {}).get("tiff:endian") == "lsb", str(
|
||||
identify
|
||||
)
|
||||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:photometric")
|
||||
== "min-is-black"
|
||||
|
|
@ -3125,6 +3124,10 @@ def tiff_multipage_img(tmp_path_factory, tmp_normal_png, tmp_inverse_png):
|
|||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
|
||||
assert identify[0]["image"].get("type") == "TrueColor", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("depth") == 8, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
"width": 60,
|
||||
|
|
@ -3135,6 +3138,9 @@ def tiff_multipage_img(tmp_path_factory, tmp_normal_png, tmp_inverse_png):
|
|||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified"
|
||||
), str(identify)
|
||||
assert identify[0]["image"].get("properties", {}).get("tiff:endian") == "lsb", str(
|
||||
identify
|
||||
)
|
||||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:photometric") == "RGB"
|
||||
), str(identify)
|
||||
|
|
@ -3158,6 +3164,10 @@ def tiff_multipage_img(tmp_path_factory, tmp_normal_png, tmp_inverse_png):
|
|||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
|
||||
assert identify[0]["image"].get("type") == "TrueColor", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("depth") == 8, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
"width": 60,
|
||||
|
|
@ -3168,6 +3178,9 @@ def tiff_multipage_img(tmp_path_factory, tmp_normal_png, tmp_inverse_png):
|
|||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified"
|
||||
), str(identify)
|
||||
assert identify[0]["image"].get("properties", {}).get("tiff:endian") == "lsb", str(
|
||||
identify
|
||||
)
|
||||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:photometric") == "RGB"
|
||||
), str(identify)
|
||||
|
|
@ -3200,6 +3213,10 @@ def tiff_palette1_img(tmp_path_factory, tmp_palette1_png):
|
|||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
|
||||
assert identify[0]["image"].get("type") == "Palette", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("depth") == 8, str(identify)
|
||||
assert identify[0]["image"].get("baseDepth") == 1, str(identify)
|
||||
assert identify[0]["image"].get("colormapEntries") == 2, str(identify)
|
||||
|
|
@ -3212,6 +3229,9 @@ def tiff_palette1_img(tmp_path_factory, tmp_palette1_png):
|
|||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified"
|
||||
), str(identify)
|
||||
assert identify[0]["image"].get("properties", {}).get("tiff:endian") == "lsb", str(
|
||||
identify
|
||||
)
|
||||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:photometric") == "palette"
|
||||
), str(identify)
|
||||
|
|
@ -3243,6 +3263,10 @@ def tiff_palette2_img(tmp_path_factory, tmp_palette2_png):
|
|||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
|
||||
assert identify[0]["image"].get("type") == "Palette", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("depth") == 8, str(identify)
|
||||
assert identify[0]["image"].get("baseDepth") == 2, str(identify)
|
||||
assert identify[0]["image"].get("colormapEntries") == 4, str(identify)
|
||||
|
|
@ -3255,6 +3279,9 @@ def tiff_palette2_img(tmp_path_factory, tmp_palette2_png):
|
|||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified"
|
||||
), str(identify)
|
||||
assert identify[0]["image"].get("properties", {}).get("tiff:endian") == "lsb", str(
|
||||
identify
|
||||
)
|
||||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:photometric") == "palette"
|
||||
), str(identify)
|
||||
|
|
@ -3286,6 +3313,10 @@ def tiff_palette4_img(tmp_path_factory, tmp_palette4_png):
|
|||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
|
||||
assert identify[0]["image"].get("type") == "Palette", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("depth") == 8, str(identify)
|
||||
assert identify[0]["image"].get("baseDepth") == 4, str(identify)
|
||||
assert identify[0]["image"].get("colormapEntries") == 16, str(identify)
|
||||
|
|
@ -3298,6 +3329,9 @@ def tiff_palette4_img(tmp_path_factory, tmp_palette4_png):
|
|||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified"
|
||||
), str(identify)
|
||||
assert identify[0]["image"].get("properties", {}).get("tiff:endian") == "lsb", str(
|
||||
identify
|
||||
)
|
||||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:photometric") == "palette"
|
||||
), str(identify)
|
||||
|
|
@ -3329,6 +3363,10 @@ def tiff_palette8_img(tmp_path_factory, tmp_palette8_png):
|
|||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
|
||||
assert identify[0]["image"].get("type") == "Palette", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("depth") == 8, str(identify)
|
||||
assert identify[0]["image"].get("colormapEntries") == 256, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
|
|
@ -3340,6 +3378,9 @@ def tiff_palette8_img(tmp_path_factory, tmp_palette8_png):
|
|||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified"
|
||||
), str(identify)
|
||||
assert identify[0]["image"].get("properties", {}).get("tiff:endian") == "lsb", str(
|
||||
identify
|
||||
)
|
||||
assert (
|
||||
identify[0]["image"].get("properties", {}).get("tiff:photometric") == "palette"
|
||||
), str(identify)
|
||||
|
|
@ -3386,10 +3427,9 @@ def tiff_ccitt_lsb_m2l_white_img(tmp_path_factory, tmp_gray1_png):
|
|||
assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
|
||||
assert identify[0]["image"].get("type") == "Bilevel", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in [
|
||||
"Undefined",
|
||||
"LSB",
|
||||
], str(identify)
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("depth") == 1, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
"width": 60,
|
||||
|
|
@ -3637,10 +3677,9 @@ def tiff_ccitt_lsb_m2l_black_img(tmp_path_factory, tmp_gray1_png):
|
|||
assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
|
||||
assert identify[0]["image"].get("type") == "Bilevel", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in [
|
||||
"Undefined",
|
||||
"LSB",
|
||||
], str(identify)
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("depth") == 1, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
"width": 60,
|
||||
|
|
@ -3728,10 +3767,9 @@ def tiff_ccitt_nometa1_img(tmp_path_factory, tmp_gray1_png):
|
|||
assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
|
||||
assert identify[0]["image"].get("type") == "Bilevel", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in [
|
||||
"Undefined",
|
||||
"LSB",
|
||||
], str(identify)
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("depth") == 1, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
"width": 60,
|
||||
|
|
@ -3813,10 +3851,9 @@ def tiff_ccitt_nometa2_img(tmp_path_factory, tmp_gray1_png):
|
|||
assert identify[0]["image"].get("units") == "PixelsPerInch", str(identify)
|
||||
assert identify[0]["image"].get("type") == "Bilevel", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in [
|
||||
"Undefined",
|
||||
"LSB",
|
||||
], str(identify)
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
|
||||
assert identify[0]["image"].get("depth") == 1, str(identify)
|
||||
assert identify[0]["image"].get("compression") == "Group4", str(identify)
|
||||
|
|
@ -3873,7 +3910,7 @@ def miff_cmyk8_img(tmp_path_factory, tmp_normal_png):
|
|||
assert "image" in identify[0]
|
||||
assert identify[0]["image"].get("format") == "MIFF", str(identify)
|
||||
assert identify[0]["image"].get("class") == "DirectClass"
|
||||
assert identify[0]["image"].get("type") == "ColorSeparation"
|
||||
assert identify[0]["image"].get("baseType") == "ColorSeparation"
|
||||
assert identify[0]["image"].get("geometry") == {
|
||||
"width": 60,
|
||||
"height": 60,
|
||||
|
|
@ -3882,6 +3919,10 @@ def miff_cmyk8_img(tmp_path_factory, tmp_normal_png):
|
|||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "CMYK", str(identify)
|
||||
assert identify[0]["image"].get("type") == "ColorSeparation", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("depth") == 8, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
"width": 60,
|
||||
|
|
@ -3917,7 +3958,7 @@ def miff_cmyk16_img(tmp_path_factory, tmp_normal_png):
|
|||
assert "image" in identify[0]
|
||||
assert identify[0]["image"].get("format") == "MIFF", str(identify)
|
||||
assert identify[0]["image"].get("class") == "DirectClass"
|
||||
assert identify[0]["image"].get("type") == "ColorSeparation"
|
||||
assert identify[0]["image"].get("baseType") == "ColorSeparation"
|
||||
assert identify[0]["image"].get("geometry") == {
|
||||
"width": 60,
|
||||
"height": 60,
|
||||
|
|
@ -3926,6 +3967,10 @@ def miff_cmyk16_img(tmp_path_factory, tmp_normal_png):
|
|||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "CMYK", str(identify)
|
||||
assert identify[0]["image"].get("type") == "ColorSeparation", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("depth") == 16, str(identify)
|
||||
assert identify[0]["image"].get("baseDepth") == 16, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
|
|
@ -3952,7 +3997,7 @@ def miff_rgb8_img(tmp_path_factory, tmp_normal_png):
|
|||
assert "image" in identify[0]
|
||||
assert identify[0]["image"].get("format") == "MIFF", str(identify)
|
||||
assert identify[0]["image"].get("class") == "DirectClass"
|
||||
assert identify[0]["image"].get("type") == "TrueColor"
|
||||
assert identify[0]["image"].get("baseType") == "TrueColor"
|
||||
assert identify[0]["image"].get("geometry") == {
|
||||
"width": 60,
|
||||
"height": 60,
|
||||
|
|
@ -3961,6 +4006,10 @@ def miff_rgb8_img(tmp_path_factory, tmp_normal_png):
|
|||
}, str(identify)
|
||||
assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
|
||||
assert identify[0]["image"].get("type") == "TrueColor", str(identify)
|
||||
endian = "endianess" if identify[0].get("version", "0") < "1.0" else "endianness"
|
||||
assert identify[0]["image"].get(endian) in ["Undefined", "LSB",], str(
|
||||
identify
|
||||
) # FIXME: should be LSB
|
||||
assert identify[0]["image"].get("depth") == 8, str(identify)
|
||||
assert identify[0]["image"].get("pageGeometry") == {
|
||||
"width": 60,
|
||||
|
|
@ -4138,60 +4187,6 @@ def jpg_2000_pdf(tmp_path_factory, jpg_2000_img, request):
|
|||
out_pdf.unlink()
|
||||
|
||||
|
||||
@pytest.fixture(scope="session", params=["internal", "pikepdf"])
|
||||
def jpg_2000_rgba8_pdf(tmp_path_factory, jpg_2000_rgba8_img, request):
|
||||
out_pdf = tmp_path_factory.mktemp("jpg_2000_rgba8_pdf") / "out.pdf"
|
||||
subprocess.check_call(
|
||||
[
|
||||
img2pdfprog,
|
||||
"--producer=",
|
||||
"--nodate",
|
||||
"--engine=" + request.param,
|
||||
"--output=" + str(out_pdf),
|
||||
jpg_2000_rgba8_img,
|
||||
]
|
||||
)
|
||||
with pikepdf.open(str(out_pdf)) as p:
|
||||
assert (
|
||||
p.pages[0].Contents.read_bytes()
|
||||
== b"q\n45.0000 0 0 45.0000 0.0000 0.0000 cm\n/Im0 Do\nQ"
|
||||
)
|
||||
assert p.pages[0].Resources.XObject.Im0.BitsPerComponent == 8
|
||||
assert not hasattr(p.pages[0].Resources.XObject.Im0, "ColorSpace")
|
||||
assert p.pages[0].Resources.XObject.Im0.Filter == "/JPXDecode"
|
||||
assert p.pages[0].Resources.XObject.Im0.Height == 60
|
||||
assert p.pages[0].Resources.XObject.Im0.Width == 60
|
||||
yield out_pdf
|
||||
out_pdf.unlink()
|
||||
|
||||
|
||||
@pytest.fixture(scope="session", params=["internal", "pikepdf"])
|
||||
def jpg_2000_rgba16_pdf(tmp_path_factory, jpg_2000_rgba16_img, request):
|
||||
out_pdf = tmp_path_factory.mktemp("jpg_2000_rgba16_pdf") / "out.pdf"
|
||||
subprocess.check_call(
|
||||
[
|
||||
img2pdfprog,
|
||||
"--producer=",
|
||||
"--nodate",
|
||||
"--engine=" + request.param,
|
||||
"--output=" + str(out_pdf),
|
||||
jpg_2000_rgba16_img,
|
||||
]
|
||||
)
|
||||
with pikepdf.open(str(out_pdf)) as p:
|
||||
assert (
|
||||
p.pages[0].Contents.read_bytes()
|
||||
== b"q\n45.0000 0 0 45.0000 0.0000 0.0000 cm\n/Im0 Do\nQ"
|
||||
)
|
||||
assert p.pages[0].Resources.XObject.Im0.BitsPerComponent == 16
|
||||
assert not hasattr(p.pages[0].Resources.XObject.Im0, "ColorSpace")
|
||||
assert p.pages[0].Resources.XObject.Im0.Filter == "/JPXDecode"
|
||||
assert p.pages[0].Resources.XObject.Im0.Height == 60
|
||||
assert p.pages[0].Resources.XObject.Im0.Width == 60
|
||||
yield out_pdf
|
||||
out_pdf.unlink()
|
||||
|
||||
|
||||
@pytest.fixture(scope="session", params=["internal", "pikepdf"])
|
||||
def png_rgb8_pdf(tmp_path_factory, png_rgb8_img, request):
|
||||
out_pdf = tmp_path_factory.mktemp("png_rgb8_pdf") / "out.pdf"
|
||||
|
|
@ -4281,10 +4276,9 @@ def gif_transparent_pdf(tmp_path_factory, gif_transparent_img, request):
|
|||
== b"q\n45.0000 0 0 45.0000 0.0000 0.0000 cm\n/Im0 Do\nQ"
|
||||
)
|
||||
assert p.pages[0].Resources.XObject.Im0.BitsPerComponent == 8
|
||||
assert p.pages[0].Resources.XObject.Im0.ColorSpace[0] == "/Indexed"
|
||||
assert p.pages[0].Resources.XObject.Im0.ColorSpace[1] == "/DeviceRGB"
|
||||
assert p.pages[0].Resources.XObject.Im0.ColorSpace == "/DeviceRGB"
|
||||
assert p.pages[0].Resources.XObject.Im0.DecodeParms.BitsPerComponent == 8
|
||||
assert p.pages[0].Resources.XObject.Im0.DecodeParms.Colors == 1
|
||||
assert p.pages[0].Resources.XObject.Im0.DecodeParms.Colors == 3
|
||||
assert p.pages[0].Resources.XObject.Im0.DecodeParms.Predictor == 15
|
||||
assert p.pages[0].Resources.XObject.Im0.Filter == "/FlateDecode"
|
||||
assert p.pages[0].Resources.XObject.Im0.Height == 60
|
||||
|
|
@ -5585,39 +5579,6 @@ def test_jpg_2000(tmp_path_factory, jpg_2000_img, jpg_2000_pdf):
|
|||
compare_pdfimages_jp2(tmpdir, jpg_2000_img, jpg_2000_pdf)
|
||||
|
||||
|
||||
@pytest.mark.skipif(
|
||||
sys.platform in ["win32"],
|
||||
reason="test utilities not available on Windows and MacOS",
|
||||
)
|
||||
@pytest.mark.skipif(
|
||||
not HAVE_JP2, reason="requires imagemagick with support for jpeg2000"
|
||||
)
|
||||
def test_jpg_2000_rgba8(tmp_path_factory, jpg_2000_rgba8_img, jpg_2000_rgba8_pdf):
|
||||
tmpdir = tmp_path_factory.mktemp("jpg_2000_rgba8")
|
||||
compare_ghostscript(tmpdir, jpg_2000_rgba8_img, jpg_2000_rgba8_pdf)
|
||||
compare_poppler(tmpdir, jpg_2000_rgba8_img, jpg_2000_rgba8_pdf)
|
||||
# compare_mupdf(tmpdir, jpg_2000_rgba8_img, jpg_2000_rgba8_pdf)
|
||||
compare_pdfimages_jp2(tmpdir, jpg_2000_rgba8_img, jpg_2000_rgba8_pdf)
|
||||
|
||||
|
||||
@pytest.mark.skipif(
|
||||
sys.platform in ["win32"],
|
||||
reason="test utilities not available on Windows and MacOS",
|
||||
)
|
||||
@pytest.mark.skipif(
|
||||
not HAVE_JP2, reason="requires imagemagick with support for jpeg2000"
|
||||
)
|
||||
def test_jpg_2000_rgba16(tmp_path_factory, jpg_2000_rgba16_img, jpg_2000_rgba16_pdf):
|
||||
tmpdir = tmp_path_factory.mktemp("jpg_2000_rgba16")
|
||||
compare_ghostscript(
|
||||
tmpdir, jpg_2000_rgba16_img, jpg_2000_rgba16_pdf, gsdevice="tiff48nc"
|
||||
)
|
||||
# poppler outputs 8-bit RGB so the comparison will not be exact
|
||||
# compare_poppler(tmpdir, jpg_2000_rgba16_img, jpg_2000_rgba16_pdf, exact=False)
|
||||
# compare_mupdf(tmpdir, jpg_2000_rgba16_img, jpg_2000_rgba16_pdf)
|
||||
compare_pdfimages_jp2(tmpdir, jpg_2000_rgba16_img, jpg_2000_rgba16_pdf)
|
||||
|
||||
|
||||
@pytest.mark.skipif(
|
||||
sys.platform in ["win32"],
|
||||
reason="test utilities not available on Windows and MacOS",
|
||||
|
|
@ -6870,96 +6831,6 @@ def general_input(request):
|
|||
return request.param
|
||||
|
||||
|
||||
@pytest.mark.skipif(not HAVE_FAKETIME, reason="requires faketime")
|
||||
@pytest.mark.parametrize(
|
||||
"engine,testdata,timezone,pdfa",
|
||||
itertools.product(
|
||||
["internal", "pikepdf"],
|
||||
["2021-02-05 17:49:00"],
|
||||
["Europe/Berlin", "GMT+12"],
|
||||
[True, False],
|
||||
),
|
||||
)
|
||||
def test_faketime(tmp_path_factory, jpg_img, engine, testdata, timezone, pdfa):
|
||||
expected = tz2utcstrftime(testdata, "D:%Y%m%d%H%M%SZ", timezone)
|
||||
out_pdf = tmp_path_factory.mktemp("faketime") / "out.pdf"
|
||||
subprocess.check_call(
|
||||
["env", f"TZ={timezone}", "faketime", "-f", testdata, img2pdfprog]
|
||||
+ (["--pdfa"] if pdfa else [])
|
||||
+ [
|
||||
"--producer=",
|
||||
"--engine=" + engine,
|
||||
"--output=" + str(out_pdf),
|
||||
str(jpg_img),
|
||||
]
|
||||
)
|
||||
with pikepdf.open(str(out_pdf)) as p:
|
||||
assert p.docinfo.CreationDate == expected
|
||||
assert p.docinfo.ModDate == expected
|
||||
if pdfa:
|
||||
assert p.Root.Metadata.Subtype == "/XML"
|
||||
assert p.Root.Metadata.Type == "/Metadata"
|
||||
expected = tz2utcstrftime(testdata, "%Y-%m-%dT%H:%M:%SZ", timezone)
|
||||
root = ET.fromstring(p.Root.Metadata.read_bytes())
|
||||
for k in ["ModifyDate", "CreateDate"]:
|
||||
assert (
|
||||
root.find(
|
||||
f".//xmp:{k}", {"xmp": "http://ns.adobe.com/xap/1.0/"}
|
||||
).text
|
||||
== expected
|
||||
)
|
||||
out_pdf.unlink()
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"engine,testdata,timezone,pdfa",
|
||||
itertools.product(
|
||||
["internal", "pikepdf"],
|
||||
[
|
||||
"2021-02-05 17:49:00",
|
||||
"2021-02-05T17:49:00",
|
||||
"Fri, 05 Feb 2021 17:49:00 +0100",
|
||||
"last year 12:00",
|
||||
],
|
||||
["Europe/Berlin", "GMT+12"],
|
||||
[True, False],
|
||||
),
|
||||
)
|
||||
def test_date(tmp_path_factory, jpg_img, engine, testdata, timezone, pdfa):
|
||||
# we use the date utility to convert the timestamp from the local
|
||||
# timezone into UTC with the format used by PDF
|
||||
expected = tz2utcstrftime(testdata, "D:%Y%m%d%H%M%SZ", timezone)
|
||||
out_pdf = tmp_path_factory.mktemp("faketime") / "out.pdf"
|
||||
subprocess.check_call(
|
||||
["env", f"TZ={timezone}", img2pdfprog]
|
||||
+ (["--pdfa"] if pdfa else [])
|
||||
+ [
|
||||
f"--moddate={testdata}",
|
||||
f"--creationdate={testdata}",
|
||||
"--producer=",
|
||||
"--engine=" + engine,
|
||||
"--output=" + str(out_pdf),
|
||||
str(jpg_img),
|
||||
]
|
||||
)
|
||||
with pikepdf.open(str(out_pdf)) as p:
|
||||
assert p.docinfo.CreationDate == expected
|
||||
assert p.docinfo.ModDate == expected
|
||||
if pdfa:
|
||||
assert p.Root.Metadata.Subtype == "/XML"
|
||||
assert p.Root.Metadata.Type == "/Metadata"
|
||||
expected = tz2utcstrftime(testdata, "%Y-%m-%dT%H:%M:%SZ", timezone)
|
||||
root = ET.fromstring(p.Root.Metadata.read_bytes())
|
||||
for k in ["ModifyDate", "CreateDate"]:
|
||||
assert (
|
||||
root.find(
|
||||
f".//xmp:{k}", {"xmp": "http://ns.adobe.com/xap/1.0/"}
|
||||
).text
|
||||
== expected
|
||||
)
|
||||
out_pdf.unlink()
|
||||
|
||||
|
||||
@pytest.mark.parametrize("engine", ["internal", "pikepdf"])
|
||||
def test_general(general_input, engine):
|
||||
inputf = os.path.join(os.path.dirname(__file__), "tests", "input", general_input)
|
||||
|
|
|
|||
55
src/jp2.py
55
src/jp2.py
|
|
@ -37,8 +37,9 @@ def getBox(data, byteStart, noBytes):
|
|||
|
||||
|
||||
def parse_ihdr(data):
|
||||
height, width, channels, bpp = struct.unpack(">IIHB", data[:11])
|
||||
return width, height, channels, bpp + 1
|
||||
height = struct.unpack(">I", data[0:4])[0]
|
||||
width = struct.unpack(">I", data[4:8])[0]
|
||||
return width, height
|
||||
|
||||
|
||||
def parse_colr(data):
|
||||
|
|
@ -58,8 +59,8 @@ def parse_colr(data):
|
|||
|
||||
def parse_resc(data):
|
||||
hnum, hden, vnum, vden, hexp, vexp = struct.unpack(">HHHHBB", data)
|
||||
hdpi = ((hnum / hden) * (10**hexp) * 100) / 2.54
|
||||
vdpi = ((vnum / vden) * (10**vexp) * 100) / 2.54
|
||||
hdpi = ((hnum / hden) * (10 ** hexp) * 100) / 2.54
|
||||
vdpi = ((vnum / vden) * (10 ** vexp) * 100) / 2.54
|
||||
return hdpi, vdpi
|
||||
|
||||
|
||||
|
|
@ -84,13 +85,13 @@ def parse_jp2h(data):
|
|||
while byteStart < noBytes and boxLengthValue != 0:
|
||||
boxLengthValue, boxType, byteEnd, boxContents = getBox(data, byteStart, noBytes)
|
||||
if boxType == b"ihdr":
|
||||
width, height, channels, bpp = parse_ihdr(boxContents)
|
||||
width, height = parse_ihdr(boxContents)
|
||||
elif boxType == b"colr":
|
||||
colorspace = parse_colr(boxContents)
|
||||
elif boxType == b"res ":
|
||||
hdpi, vdpi = parse_res(boxContents)
|
||||
byteStart = byteEnd
|
||||
return (width, height, colorspace, hdpi, vdpi, channels, bpp)
|
||||
return (width, height, colorspace, hdpi, vdpi)
|
||||
|
||||
|
||||
def parsejp2(data):
|
||||
|
|
@ -101,9 +102,7 @@ def parsejp2(data):
|
|||
while byteStart < noBytes and boxLengthValue != 0:
|
||||
boxLengthValue, boxType, byteEnd, boxContents = getBox(data, byteStart, noBytes)
|
||||
if boxType == b"jp2h":
|
||||
width, height, colorspace, hdpi, vdpi, channels, bpp = parse_jp2h(
|
||||
boxContents
|
||||
)
|
||||
width, height, colorspace, hdpi, vdpi = parse_jp2h(boxContents)
|
||||
break
|
||||
byteStart = byteEnd
|
||||
if not width:
|
||||
|
|
@ -113,41 +112,13 @@ def parsejp2(data):
|
|||
if not colorspace:
|
||||
raise Exception("no colorspace in jp2 header")
|
||||
# retrieving the dpi is optional so we do not error out if not present
|
||||
return (width, height, colorspace, hdpi, vdpi, channels, bpp)
|
||||
|
||||
|
||||
def parsej2k(data):
|
||||
lsiz, rsiz, xsiz, ysiz, xosiz, yosiz, _, _, _, _, csiz = struct.unpack(
|
||||
">HHIIIIIIIIH", data[4:42]
|
||||
)
|
||||
ssiz = [None] * csiz
|
||||
xrsiz = [None] * csiz
|
||||
yrsiz = [None] * csiz
|
||||
for i in range(csiz):
|
||||
ssiz[i], xrsiz[i], yrsiz[i] = struct.unpack(
|
||||
"BBB", data[42 + 3 * i : 42 + 3 * (i + 1)]
|
||||
)
|
||||
assert ssiz == [7, 7, 7]
|
||||
return xsiz - xosiz, ysiz - yosiz, None, None, None, csiz, 8
|
||||
|
||||
|
||||
def parse(data):
|
||||
if data[:4] == b"\xff\x4f\xff\x51":
|
||||
return parsej2k(data)
|
||||
else:
|
||||
return parsejp2(data)
|
||||
return (width, height, colorspace, hdpi, vdpi)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
import sys
|
||||
|
||||
width, height, colorspace, hdpi, vdpi, channels, bpp = parse(
|
||||
open(sys.argv[1], "rb").read()
|
||||
)
|
||||
print("width = %d" % width)
|
||||
print("height = %d" % height)
|
||||
print("colorspace = %s" % colorspace)
|
||||
print("hdpi = %s" % hdpi)
|
||||
print("vdpi = %s" % vdpi)
|
||||
print("channels = %s" % channels)
|
||||
print("bpp = %s" % bpp)
|
||||
width, height, colorspace = parsejp2(open(sys.argv[1]).read())
|
||||
sys.stdout.write("width = %d" % width)
|
||||
sys.stdout.write("height = %d" % height)
|
||||
sys.stdout.write("colorspace = %s" % colorspace)
|
||||
|
|
|
|||
Loading…
Reference in a new issue