README.md - Fix Windows bin URL

Thanks: gregor herrmann <gregoa@debian.org>

.mailmap

@@ -0,0 +1,3 @@
+Johannes Schauer Marin Rodrigues <josch@mister-muffin.de>
+Johannes Schauer Marin Rodrigues <josch@mister-muffin.de> <j.schauer@email.de>
+Johannes Schauer Marin Rodrigues <josch@mister-muffin.de> <josch@pyneo.org>

.travis.yml

@@ -1,16 +1,26 @@
 language: python
 matrix:
   include:
-    - name: "python 3.7 Xenial"
-      dist: xenial
-      python: 3.7
-    - name: "python 3.8 Windows"
+    - name: "Ubuntu Focal"
+      dist: focal
+      addons:
+        apt:
+          packages:
+            - imagemagick
+            - libtiff-tools
+            - libimage-exiftool-perl
+            - poppler-utils
+            - netpbm
+            - ghostscript
+            - mupdf-tools
+    - name: "python 3.9 Windows"
       os: windows
       language: shell       # 'language: python' is an error on Travis CI Windows
-      before_install: choco install python
-      env: PATH=/c/Python38:/c/Python38/Scripts:$PATH
+      before_install: choco install python imagemagick
+      env: PATH=/c/Python39:/c/Python39/Scripts:$PATH
     - name: "python 3.7 MacOs"
       os: osx
+      osx_image: xcode12.2  # pikepdf import fails with earlier versions
       language: shell       # 'language: python' is an error on Travis CI macOS
       cache:
         directories:
@@ -19,12 +29,14 @@ matrix:
       addons:
         homebrew:
           #update: true
-          packages: python3
+          packages:
+            - python3
+            - imagemagick
       before_install:
         - python3 -m pip install --upgrade virtualenv
         - virtualenv -p python3 --system-site-packages "$HOME/venv"
         - source "$HOME/venv/bin/activate"
-install: pip install wheel pillow pytest pdfrw
+install: pip install tox
 script:
   - python --version
-  - python setup.py test
+  - python -m tox

CHANGES.rst

@@ -2,6 +2,73 @@
 CHANGES
 =======
 
+0.6.0 (2025-02-15)
+------------------
+
+ - Add support for JBIG2 (generic coding)
+ - Add convert_to_docobject() broken out from convert()
+ - Add pil_get_dpi() broken out from get_imgmetadata()
+
+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)
+------------------
+
+ - --viewer-page-layout support for twopageright and twopageleft
+ - Add B and JB paper sizes
+ - support for pikepdf (>= 5.0.0) and Pillow (>= 9.1.0)
+
+0.4.3 (2021-10-24)
+------------------
+
+ - fix --viewer-initial-page (broken in last release)
+
+0.4.2 (2021-10-11)
+------------------
+
+ - add --rotation
+ - allow palette PNG images with ICC profile
+ - sort globbing result on windows
+ - convert 8-bit PNG alpha channels to /SMasks in PDF
+ - remove pdfrw from tests
+
+0.4.1 (2021-05-09)
+------------------
+
+ - support wildcards in paths on windows
+ - support MPO images
+ - fix page border computation
+ - use "img2pdf" logger instead of "root" logger
+ - add --from-file
+
+0.4.0 (2020-08-07)
+------------------
+
+ - replace --without-pdfrw by --engine=internal or --engine=pdfrw
+ - add pikepdf as additional rendering engine and add --engine=pikepdf
+ - support for creating PDF/A-1b compliant PDF using the --pdfa option
+   (this also requires the presence of an ICC profile somewhere on the system)
+ - support for images with embedded ICC profile as input
+ - rewrite tests
+    * use pytest via tox
+    * use pikepdf instead of pdfrw
+    * use imagemagick json output instead of identify -verbose
+ - format all code with black
+
 0.3.6 (2020-04-30)
 ------------------
 

HACKING

@@ -8,31 +8,7 @@ img2pdf can be run directly from the cloned git repository:
 Running the testsuite
 ---------------------
 
-    $ python3 setup.py test
-    $ ./test.sh
-
-Fixing the setup.py testsuite
------------------------------
-
-Sometimes your changes will break the testsuite. The testsuite works by
-comparing the images found in `src/tests/input` with the corresponding PDF
-documents in `src/tests/output`. The filename of the output file will be the
-same name the input has with the `.pdf` suffix appended to it. To generate the
-files in the `src/tests/output` directory via the command line, run:
-
-    $ src/img2pdf.py --producer="" --nodate src/tests/input/normal.jpg -o src/tests/output/normal.jpg.pdf
-
-This makes it easier to spot where the differences are and how to fix the
-issue.
-
-Fixing the test.sh testsuite
-----------------------------
-
-If your changes break test.sh, then the script will abort immediately and tell
-you where it left the temporary files for you to inspect. You can also try
-running the script like this for maximum verbosity:
-
-    $ sh -x ./test.sh
+    $ pytest
 
 Making a new release
 --------------------
@@ -51,6 +27,57 @@ Making a new release
 
  - Build and upload to pypi:
 
-    $ rm dist/*
+    $ rm -rf dist/*
     $ python3 setup.py sdist
-    $ twine upload --sign dist/*
+    $ twine upload dist/*
+
+ - Push everything to git forge
+
+    $ git push
+
+ - Push to github
+
+    $ git push github
+
+ - Obtain img2pdf.exe from appveyor:
+
+    https://ci.appveyor.com/project/josch/img2pdf/
+
+ - Create new release:
+
+    https://gitlab.mister-muffin.de/josch/img2pdf/releases/new
+
+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 ...

README.md

@@ -1,5 +1,5 @@
-[![Travis Status](https://travis-ci.org/josch/img2pdf.svg?branch=master)](https://travis-ci.org/josch/img2pdf)
-[![Appveyor Status](https://ci.appveyor.com/api/projects/status/2kws3wkqvi526llj/branch/master?svg=true)](https://ci.appveyor.com/project/josch/img2pdf/branch/master)
+[![Travis Status](https://travis-ci.com/josch/img2pdf.svg?branch=main)](https://app.travis-ci.com/josch/img2pdf)
+[![Appveyor Status](https://ci.appveyor.com/api/projects/status/2kws3wkqvi526llj/branch/main?svg=true)](https://ci.appveyor.com/project/josch/img2pdf/branch/main)
 
 img2pdf
 =======
@@ -27,18 +27,20 @@ software, because the raw pixel data never has to be loaded into memory.
 The following table shows how img2pdf handles different input depending on the
 input file format and image color space.
 
-| Format               | Colorspace                     | Result        |
-| -------------------- | ------------------------------ | ------------- |
-| JPEG                 | any                            | direct        |
-| JPEG2000             | any                            | direct        |
-| PNG (non-interlaced) | any                            | direct        |
-| TIFF (CCITT Group 4) | monochrome                     | direct        |
-| any                  | any except CMYK and monochrome | PNG Paeth     |
-| any                  | monochrome                     | CCITT Group 4 |
-| any                  | CMYK                           | flate         |
+| Format                                | Colorspace                           | Result        |
+| ------------------------------------- | ------------------------------------ | ------------- |
+| JPEG                                  | any                                  | direct        |
+| JPEG2000                              | any                                  | direct        |
+| PNG (non-interlaced, no transparency) | any                                  | direct        |
+| TIFF (CCITT Group 4)                  | 1-bit monochrome                     | direct        |
+| JBIG2 (single-page generic coding)    | 1-bit monochrome                     | direct        |
+| any                                   | any except CMYK and 1-bit monochrome | PNG Paeth     |
+| any                                   | 1-bit monochrome                     | CCITT Group 4 |
+| any                                   | CMYK                                 | flate         |
 
-For JPEG, JPEG2000, non-interlaced PNG and TIFF images with CCITT Group 4
-encoded data, img2pdf directly embeds the image data into the PDF without
+For JPEG, JPEG2000, non-interlaced PNG, TIFF images with CCITT Group 4
+encoded data, and JBIG2 with single-page generic coding (e.g. using `jbig2enc`),
+img2pdf directly embeds the image data into the PDF without
 re-encoding it. It thus treats the PDF format merely as a container format for
 the image data. In these cases, img2pdf only increases the filesize by the size
 of the PDF container (typically around 500 to 700 bytes). Since data is only
@@ -47,7 +49,7 @@ solutions for these input formats.
 
 For all other input types, img2pdf first has to transform the pixel data to
 make it compatible with PDF. In most cases, the PNG Paeth filter is applied to
-the pixel data. For monochrome input, CCITT Group 4 is used instead. Only for
+the pixel data. For 1-bit monochrome input, CCITT Group 4 is used instead. Only for
 CMYK input no filter is applied before finally applying flate compression.
 
 Usage
@@ -65,6 +67,12 @@ The detailed documentation can be accessed by running:
 
 	$ img2pdf --help
 
+With no command line arguments supplied, img2pdf will read a single image from
+standard input and write the resulting PDF to standard output. Here is an
+example for how to scan directly to PDF using scanimage(1) from SANE:
+
+	$ scanimage --mode=Color --resolution=300 | pnmtojpeg -quality 90 | img2pdf > scan.pdf
+
 Bugs
 ----
 
@@ -72,15 +80,15 @@ Bugs
    when embedded into the PDF cannot be read by the Adobe Acrobat Reader,
    please contact me.
 
- - I have not yet figured out how to determine the colorspace of JPEG2000
-   files.  Therefore JPEG2000 files use DeviceRGB by default. For JPEG2000
-   files with other colorspaces, you must explicitly specify it using the
-   `--colorspace` option.
-
- - Input images with alpha channels are not allowed. PDF doesn't support alpha
-   channels in images and thus, the alpha channel of the input would have to be
-   discarded. But img2pdf will always be lossless and thus, input images must
-   not carry transparency information.
+ - An error is produced if the input image is broken. This commonly happens if
+   the input image has an invalid EXIF Orientation value of zero. Even though
+   only nine different values from 1 to 9 are permitted, Anroid phones and
+   Canon DSLR cameras produce JPEG images with the invalid value of zero.
+   Either fix your input images with `exiftool` or similar software before
+   passing the JPEG to `img2pdf` or run `img2pdf` with `--rotation=ifvalid`
+   (if you run img2pdf from the commandline) or by passing
+   `rotation=img2pdf.Rotation.ifvalid` as an argument to `convert()` when using
+   img2pdf as a library.
 
  - img2pdf uses PIL (or Pillow) to obtain image meta data and to convert the
    input if necessary. To prevent decompression bomb denial of service attacks,
@@ -117,10 +125,9 @@ You can then test the converter using:
 
 	$ ve/bin/img2pdf -o test.pdf src/tests/test.jpg
 
-For Microsoft Windows users, PyInstaller based .exe files are produced by
-appveyor. If you don't want to install Python before using img2pdf you can head
-to appveyor and click on "Artifacts" to download the latest version:
-https://ci.appveyor.com/project/josch/img2pdf
+If you don't want to setup Python on Windows, then head to the
+[releases](https://gitlab.mister-muffin.de/josch/img2pdf/releases) section and download the latest
+`img2pdf.exe`.
 
 GUI
 ---
@@ -147,6 +154,10 @@ The package can also be used as a library:
 	with open("name.pdf","wb") as f1, open("test.jpg") as f2:
 		f1.write(img2pdf.convert(f2))
 
+	# opening using pathlib
+	with open("name.pdf","wb") as f:
+		f.write(img2pdf.convert(pathlib.Path('test.jpg')))
+
 	# using in-memory image data
 	with open("name.pdf","wb") as f:
 		f.write(img2pdf.convert("\x89PNG...")
@@ -161,26 +172,26 @@ The package can also be used as a library:
 
 	# convert all files ending in .jpg inside a directory
 	dirname = "/path/to/images"
+	imgs = []
+	for fname in os.listdir(dirname):
+		if not fname.endswith(".jpg"):
+			continue
+		path = os.path.join(dirname, fname)
+		if os.path.isdir(path):
+			continue
+		imgs.append(path)
 	with open("name.pdf","wb") as f:
-		imgs = []
-		for fname in os.listdir(dirname):
-			if not fname.endswith(".jpg"):
-				continue
-			path = os.path.join(dirname, fname)
-			if os.path.isdir(path):
-				continue
-			imgs.append(path)
 		f.write(img2pdf.convert(imgs))
 
 	# convert all files ending in .jpg in a directory and its subdirectories
 	dirname = "/path/to/images"
+	imgs = []
+	for r, _, f in os.walk(dirname):
+		for fname in f:
+			if not fname.endswith(".jpg"):
+				continue
+			imgs.append(os.path.join(r, fname))
 	with open("name.pdf","wb") as f:
-		imgs = []
-		for r, _, f in os.walk(dirname):
-			for fname in f:
-				if not fname.endswith(".jpg"):
-					continue
-				imgs.append(os.path.join(r, fname))
 		f.write(img2pdf.convert(imgs))
 
 
@@ -189,6 +200,15 @@ The package can also be used as a library:
 	with open("name.pdf","wb") as f:
 		f.write(img2pdf.convert(glob.glob("/path/to/*.jpg")))
 
+	# convert all files matching a glob using pathlib.Path
+	from pathlib import Path
+	with open("name.pdf","wb") as f:
+		f.write(img2pdf.convert(*Path("/path").glob("**/*.jpg")))
+
+	# ignore invalid rotation values in the input images
+	with open("name.pdf","wb") as f:
+		f.write(img2pdf.convert('test.jpg'), rotation=img2pdf.Rotation.ifvalid)
+
 	# writing to file descriptor
 	with open("name.pdf","wb") as f1, open("test.jpg") as f2:
 		img2pdf.convert(f2, outputstream=f1)
@@ -199,6 +219,16 @@ The package can also be used as a library:
 	with open("name.pdf","wb") as f:
 		f.write(img2pdf.convert('test.jpg', layout_fun=layout_fun))
 
+	# use a fixed dpi of 300 instead of reading it from the image
+	dpix = dpiy = 300
+	layout_fun = img2pdf.get_fixed_dpi_layout_fun((dpix, dpiy))
+	with open("name.pdf","wb") as f:
+		f.write(img2pdf.convert('test.jpg', layout_fun=layout_fun))
+
+	# create a PDF/A-1b compliant document by passing an ICC profile
+	with open("name.pdf","wb") as f:
+		f.write(img2pdf.convert('test.jpg', pdfa="/usr/share/color/icc/sRGB.icc"))
+
 Comparison to ImageMagick
 -------------------------
 
@@ -286,3 +316,14 @@ Tesseract might not do a lossless conversion. For example it converts CMYK
 input to RGB and removes the alpha channel from images with transparency. For
 multipage TIFF or animated GIF, it will only convert the first frame.
 
+Comparison to econvert from ExactImage
+--------------------------------------
+
+Like pdflatex and podofoimg2pf, econvert is able to embed JPEG images into PDF
+directly without re-encoding but when given other file formats, it stores them
+just using flate compressen, which unnecessarily increases the filesize.
+Furthermore, it throws an error with CMYK TIF input. It also doesn't store CMYK
+jpeg files as CMYK but converts them to RGB, so it's not lossless. When trying
+to feed it 16bit files, it errors out with Unhandled bps/spp combination. It
+also seems to choose JPEG encoding when using it on some file types (like
+palette images) making it again not lossless for that input as well.

appveyor.yml

@@ -16,16 +16,18 @@ environment:
     - PYTHON: "C:\\Python37-x64"
 
 install:
-  - "%PYTHON%\\python.exe -m pip install wheel pytest pdfrw pillow pyinstaller"
+  - "%PYTHON%\\python.exe -m pip install tox wheel pyinstaller Pillow"
 
 build: off
 
-test_script:
-  - "%PYTHON%\\python.exe setup.py test"
+# don't run tests on windows because we don't have imagemagick
+#test_script:
+#  - "%PYTHON%\\python.exe -m tox"
 
 after_test:
   - "%PYTHON%\\python.exe setup.py bdist_wheel"
-  - "%PYTHON%\\python.exe -m PyInstaller --clean --onefile --noconsole src/img2pdf.py"
+  - "%PYTHON%\\python.exe -m PyInstaller --clean --onefile --console --nowindowed --name img2pdf src/img2pdf.py"
+  #- "%PYTHON%\\python.exe -m PyInstaller --clean --onefile --noconsole --windowed --name img2pdf_windowed src/img2pdf.py"
 
 artifacts:
   - path: dist\*

magick.py

@@ -1,352 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-import numpy
-import scipy.signal
-import zlib
-import struct
-
-
-def find_closest_palette_color(color, palette):
-    if color.ndim == 0:
-        idx = (numpy.abs(palette - color)).argmin()
-    else:
-        # naive distance function by computing the euclidean distance in RGB space
-        idx = ((palette - color) ** 2).sum(axis=-1).argmin()
-    return palette[idx]
-
-
-def floyd_steinberg(img, palette):
-    for y in range(img.shape[0]):
-        for x in range(img.shape[1]):
-            oldpixel = img[y, x]
-            newpixel = find_closest_palette_color(oldpixel, palette)
-            quant_error = oldpixel - newpixel
-            img[y, x] = newpixel
-            if x + 1 < img.shape[1]:
-                img[y, x + 1] += quant_error * 7 / 16
-            if y + 1 < img.shape[0]:
-                img[y + 1, x - 1] += quant_error * 3 / 16
-                img[y + 1, x] += quant_error * 5 / 16
-            if x + 1 < img.shape[1] and y + 1 < img.shape[0]:
-                img[y + 1, x + 1] += quant_error * 1 / 16
-    return img
-
-
-def convolve_rgba(img, kernel):
-    return numpy.stack(
-        (
-            scipy.signal.convolve2d(img[:, :, 0], kernel, "same"),
-            scipy.signal.convolve2d(img[:, :, 1], kernel, "same"),
-            scipy.signal.convolve2d(img[:, :, 2], kernel, "same"),
-            scipy.signal.convolve2d(img[:, :, 3], kernel, "same"),
-        ),
-        axis=-1,
-    )
-
-
-def rgb2gray(img):
-    result = numpy.zeros((60, 60), dtype=numpy.dtype("int64"))
-    for y in range(img.shape[0]):
-        for x in range(img.shape[1]):
-            clin = sum(img[y, x] * [0.2126, 0.7152, 0.0722]) / 0xFFFF
-            if clin <= 0.0031308:
-                csrgb = 12.92 * clin
-            else:
-                csrgb = 1.055 * clin ** (1 / 2.4) - 0.055
-            result[y, x] = csrgb * 0xFFFF
-    return result
-
-
-def palettize(img, pal):
-    result = numpy.zeros((img.shape[0], img.shape[1]), dtype=numpy.dtype("int64"))
-    for y in range(img.shape[0]):
-        for x in range(img.shape[1]):
-            for i, col in enumerate(pal):
-                if numpy.array_equal(img[y, x], col):
-                    result[y, x] = i
-                    break
-            else:
-                raise Exception()
-    return result
-
-
-# we cannot use zlib.compress() because different compressors may compress the
-# same data differently, for example by using different optimizations on
-# different architectures:
-# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/R7GD4L5Z6HELCDAL2RDESWR2F3ZXHWVX/
-#
-# to make the compressed representation of the uncompressed data bit-by-bit
-# identical on all platforms we make use of the compression method 0, that is,
-# no compression at all :)
-def compress(data):
-    # two-byte zlib header (rfc1950)
-    # common header for lowest compression level
-    # bits 0-3: Compression info, base-2 logarithm of the LZ77 window size,
-    #           minus eight -- 7 indicates a 32K window size
-    # bits 4-7: Compression method -- 8 is deflate
-    # bits 8-9: Compression level -- 0 is fastest
-    # bit 10:   preset dictionary -- 0 is none
-    # bits 11-15: check bits so that the 16-bit unsigned integer stored in MSB
-    #             order is a multiple of 31
-    result = b"\x78\x01"
-    # content is stored in deflate format (rfc1951)
-    # maximum chunk size is the largest 16 bit unsigned integer
-    chunksize = 0xFFFF
-    for i in range(0, len(data), chunksize):
-        # bits 0-4 are unused
-        # bits 5-6 indicate compression method -- 0 is no compression
-        # bit 7 indicates the last chunk
-        if i * chunksize < len(data) - chunksize:
-            result += b"\x00"
-        else:
-            # last chunck
-            result += b"\x01"
-        chunk = data[i : i + chunksize]
-        # the chunk length as little endian 16 bit unsigned integer
-        result += struct.pack("<H", len(chunk))
-        # the one's complement of the chunk length
-        # one's complement is all bits inverted which is the result of
-        # xor with 0xffff for a 16 bit unsigned integer
-        result += struct.pack("<H", len(chunk) ^ 0xFFFF)
-        result += chunk
-    # adler32 checksum of the uncompressed data as big endian 32 bit unsigned
-    # integer
-    result += struct.pack(">I", zlib.adler32(data))
-    return result
-
-
-def write_png(data, path, bitdepth, colortype, palette=None):
-    with open(path, "wb") as f:
-        f.write(b"\x89PNG\r\n\x1A\n")
-        # PNG image type        Colour type Allowed bit depths
-        # Greyscale             0           1, 2, 4, 8, 16
-        # Truecolour            2           8, 16
-        # Indexed-colour        3           1, 2, 4, 8
-        # Greyscale with alpha  4           8, 16
-        # Truecolour with alpha 6           8, 16
-        block = b"IHDR" + struct.pack(
-            ">IIBBBBB",
-            data.shape[1],  # width
-            data.shape[0],  # height
-            bitdepth,  # bitdepth
-            colortype,  # colortype
-            0,  # compression
-            0,  # filtertype
-            0,  # interlaced
-        )
-        f.write(
-            struct.pack(">I", len(block) - 4)
-            + block
-            + struct.pack(">I", zlib.crc32(block))
-        )
-        if palette is not None:
-            block = b"PLTE"
-            for col in palette:
-                block += struct.pack(">BBB", col[0], col[1], col[2])
-            f.write(
-                struct.pack(">I", len(block) - 4)
-                + block
-                + struct.pack(">I", zlib.crc32(block))
-            )
-        raw = b""
-        for y in range(data.shape[0]):
-            raw += b"\0"
-            if bitdepth == 16:
-                raw += data[y].astype(">u2").tobytes()
-            elif bitdepth == 8:
-                raw += data[y].astype(">u1").tobytes()
-            elif bitdepth in [4, 2, 1]:
-                valsperbyte = 8 // bitdepth
-                for x in range(0, data.shape[1], valsperbyte):
-                    val = 0
-                    for j in range(valsperbyte):
-                        if x + j >= data.shape[1]:
-                            break
-                        val |= (data[y, x + j].astype(">u2") & (2 ** bitdepth - 1)) << (
-                            (valsperbyte - j - 1) * bitdepth
-                        )
-                    raw += struct.pack(">B", val)
-            else:
-                raise Exception()
-        compressed = compress(raw)
-        block = b"IDAT" + compressed
-        f.write(
-            struct.pack(">I", len(compressed))
-            + block
-            + struct.pack(">I", zlib.crc32(block))
-        )
-        block = b"IEND"
-        f.write(struct.pack(">I", 0) + block + struct.pack(">I", zlib.crc32(block)))
-
-
-def main():
-    outdir = sys.argv[1]
-
-    # create a 256 color palette by first writing 16 shades of gray
-    # and then writing an array of RGB colors with 6, 8 and 5 levels
-    # for red, green and blue, respectively
-    pal8 = numpy.zeros((256, 3), dtype=numpy.dtype("int64"))
-    i = 0
-    for gray in range(15, 255, 15):
-        pal8[i] = [gray, gray, gray]
-        i += 1
-    for red in 0, 0x33, 0x66, 0x99, 0xCC, 0xFF:
-        for green in 0, 0x24, 0x49, 0x6D, 0x92, 0xB6, 0xDB, 0xFF:
-            for blue in 0, 0x40, 0x80, 0xBF, 0xFF:
-                pal8[i] = [red, green, blue]
-                i += 1
-    assert i == 256
-
-    # windows 16 color palette
-    pal4 = numpy.array(
-        [
-            [0x00, 0x00, 0x00],
-            [0x80, 0x00, 0x00],
-            [0x00, 0x80, 0x00],
-            [0x80, 0x80, 0x00],
-            [0x00, 0x00, 0x80],
-            [0x80, 0x00, 0x80],
-            [0x00, 0x80, 0x80],
-            [0xC0, 0xC0, 0xC0],
-            [0x80, 0x80, 0x80],
-            [0xFF, 0x00, 0x00],
-            [0x00, 0xFF, 0x00],
-            [0xFF, 0x00, 0x00],
-            [0x00, 0xFF, 0x00],
-            [0xFF, 0x00, 0xFF],
-            [0x00, 0xFF, 0x00],
-            [0xFF, 0xFF, 0xFF],
-        ],
-        dtype=numpy.dtype("int64"),
-    )
-
-    # choose values slightly off red, lime and blue because otherwise
-    # imagemagick will classify the image as Depth: 8/1-bit
-    pal2 = numpy.array(
-        [[0, 0, 0], [0xFE, 0, 0], [0, 0xFE, 0], [0, 0, 0xFE]],
-        dtype=numpy.dtype("int64"),
-    )
-
-    # don't choose black and white or otherwise imagemagick will classify the
-    # image as bilevel with 8/1-bit depth instead of palette with 8-bit color
-    # don't choose gray colors or otherwise imagemagick will classify the
-    # image as grayscale
-    pal1 = numpy.array(
-        [[0x01, 0x02, 0x03], [0xFE, 0xFD, 0xFC]], dtype=numpy.dtype("int64")
-    )
-
-    # gaussian kernel with sigma=3
-    kernel = numpy.array(
-        [
-            [0.011362, 0.014962, 0.017649, 0.018648, 0.017649, 0.014962, 0.011362],
-            [0.014962, 0.019703, 0.02324, 0.024556, 0.02324, 0.019703, 0.014962],
-            [0.017649, 0.02324, 0.027413, 0.028964, 0.027413, 0.02324, 0.017649],
-            [0.018648, 0.024556, 0.028964, 0.030603, 0.028964, 0.024556, 0.018648],
-            [0.017649, 0.02324, 0.027413, 0.028964, 0.027413, 0.02324, 0.017649],
-            [0.014962, 0.019703, 0.02324, 0.024556, 0.02324, 0.019703, 0.014962],
-            [0.011362, 0.014962, 0.017649, 0.018648, 0.017649, 0.014962, 0.011362],
-        ],
-        numpy.float,
-    )
-
-    # constructs a 2D array of a circle with a width of 36
-    circle = list()
-    offsets_36 = [14, 11, 9, 7, 6, 5, 4, 3, 3, 2, 2, 1, 1, 1, 0, 0, 0, 0]
-    for offs in offsets_36 + offsets_36[::-1]:
-        circle.append([0] * offs + [1] * (len(offsets_36) - offs) * 2 + [0] * offs)
-
-    alpha = numpy.zeros((60, 60, 4), dtype=numpy.dtype("int64"))
-
-    # draw three circles
-    for (xpos, ypos, color) in [
-        (12, 3, [0xFFFF, 0, 0, 0xFFFF]),
-        (21, 21, [0, 0xFFFF, 0, 0xFFFF]),
-        (3, 21, [0, 0, 0xFFFF, 0xFFFF]),
-    ]:
-        for x, row in enumerate(circle):
-            for y, pos in enumerate(row):
-                if pos:
-                    alpha[y + ypos, x + xpos] += color
-    alpha = numpy.clip(alpha, 0, 0xFFFF)
-    alpha = convolve_rgba(alpha, kernel)
-
-    write_png(alpha, outdir + "/alpha.png", 16, 6)
-
-    normal16 = alpha[:, :, 0:3]
-    write_png(normal16, outdir + "/normal16.png", 16, 2)
-
-    write_png(normal16 / 0xFFFF * 0xFF, outdir + "/normal.png", 8, 2)
-
-    write_png(0xFF - normal16 / 0xFFFF * 0xFF, outdir + "/inverse.png", 8, 2)
-
-    gray16 = rgb2gray(normal16)
-
-    write_png(gray16, outdir + "/gray16.png", 16, 0)
-
-    write_png(gray16 / 0xFFFF * 0xFF, outdir + "/gray8.png", 8, 0)
-
-    write_png(
-        floyd_steinberg(gray16, numpy.arange(16) / 0xF * 0xFFFF) / 0xFFFF * 0xF,
-        outdir + "/gray4.png",
-        4,
-        0,
-    )
-
-    write_png(
-        floyd_steinberg(gray16, numpy.arange(4) / 0x3 * 0xFFFF) / 0xFFFF * 0x3,
-        outdir + "/gray2.png",
-        2,
-        0,
-    )
-
-    write_png(
-        floyd_steinberg(gray16, numpy.arange(2) / 0x1 * 0xFFFF) / 0xFFFF * 0x1,
-        outdir + "/gray1.png",
-        1,
-        0,
-    )
-
-    write_png(
-        palettize(
-            floyd_steinberg(normal16, pal8 * 0xFFFF / 0xFF) / 0xFFFF * 0xFF, pal8
-        ),
-        outdir + "/palette8.png",
-        8,
-        3,
-        pal8,
-    )
-
-    write_png(
-        palettize(
-            floyd_steinberg(normal16, pal4 * 0xFFFF / 0xFF) / 0xFFFF * 0xFF, pal4
-        ),
-        outdir + "/palette4.png",
-        4,
-        3,
-        pal4,
-    )
-
-    write_png(
-        palettize(
-            floyd_steinberg(normal16, pal2 * 0xFFFF / 0xFF) / 0xFFFF * 0xFF, pal2
-        ),
-        outdir + "/palette2.png",
-        2,
-        3,
-        pal2,
-    )
-
-    write_png(
-        palettize(
-            floyd_steinberg(normal16, pal1 * 0xFFFF / 0xFF) / 0xFFFF * 0xFF, pal1
-        ),
-        outdir + "/palette1.png",
-        1,
-        3,
-        pal1,
-    )
-
-
-if __name__ == "__main__":
-    main()

setup.cfg

@@ -1,2 +0,0 @@
-[metadata]
-description-file = README.md

setup.py

@@ -1,58 +1,51 @@
 import sys
 from setuptools import setup
 
-VERSION = "0.3.6"
+VERSION = "0.6.0"
 
 INSTALL_REQUIRES = (
-    'Pillow',
+    "Pillow",
+    "pikepdf",
 )
 
-TESTS_REQUIRE = (
-    'pdfrw',
-)
-
-
 setup(
-    name='img2pdf',
+    name="img2pdf",
     version=VERSION,
-    author="Johannes 'josch' Schauer",
-    author_email='josch@mister-muffin.de',
+    author="Johannes Schauer Marin Rodrigues",
+    author_email="josch@mister-muffin.de",
     description="Convert images to PDF via direct JPEG inclusion.",
-    long_description=open('README.md').read(),
-    long_description_content_type='text/markdown',
+    long_description=open("README.md").read(),
+    long_description_content_type="text/markdown",
     license="LGPL",
     keywords="jpeg pdf converter",
     classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Intended Audience :: Developers',
-        'Intended Audience :: Other Audience',
-        'Environment :: Console',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: Implementation :: CPython',
+        "Development Status :: 5 - Production/Stable",
+        "Intended Audience :: Developers",
+        "Intended Audience :: Other Audience",
+        "Environment :: Console",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
-        'License :: OSI Approved :: GNU Lesser General Public License v3 '
-        '(LGPLv3)',
-        'Natural Language :: English',
-        'Operating System :: OS Independent'],
-    url='https://gitlab.mister-muffin.de/josch/img2pdf',
-    download_url='https://gitlab.mister-muffin.de/josch/img2pdf/repository/'
-        'archive.tar.gz?ref=' + VERSION,
+        "License :: OSI Approved :: GNU Lesser General Public License v3 " "(LGPLv3)",
+        "Natural Language :: English",
+        "Operating System :: OS Independent",
+    ],
+    url="https://gitlab.mister-muffin.de/josch/img2pdf",
+    download_url="https://gitlab.mister-muffin.de/josch/img2pdf/repository/"
+    "archive.tar.gz?ref=" + VERSION,
     package_dir={"": "src"},
-    py_modules=['img2pdf', 'jp2'],
+    py_modules=["img2pdf", "jp2"],
     include_package_data=True,
-    test_suite='tests.test_suite',
     zip_safe=True,
     install_requires=INSTALL_REQUIRES,
-    tests_requires=TESTS_REQUIRE,
     extras_require={
-        'test': TESTS_REQUIRE,
-        'gui': ('tkinter'),
+        "gui": ("tkinter"),
     },
     entry_points={
         "setuptools.installation": ["eggsecutable = img2pdf:main"],
         "console_scripts": ["img2pdf = img2pdf:main"],
         "gui_scripts": ["img2pdf-gui = img2pdf:gui"],
     },
-    )
+)

src/jp2.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (C) 2013 Johannes 'josch' Schauer <j.schauer at email.de>
+# Copyright (C) 2013 Johannes Schauer Marin Rodrigues <j.schauer at email.de>
 #
 # this module is heavily based upon jpylyzer which is
 # KB / National Library of the Netherlands, Open Planets Foundation
@@ -23,23 +23,22 @@ import struct
 
 
 def getBox(data, byteStart, noBytes):
-    boxLengthValue = struct.unpack(">I", data[byteStart:byteStart+4])[0]
-    boxType = data[byteStart+4:byteStart+8]
+    boxLengthValue = struct.unpack(">I", data[byteStart : byteStart + 4])[0]
+    boxType = data[byteStart + 4 : byteStart + 8]
     contentsStartOffset = 8
     if boxLengthValue == 1:
-        boxLengthValue = struct.unpack(">Q", data[byteStart+8:byteStart+16])[0]
+        boxLengthValue = struct.unpack(">Q", data[byteStart + 8 : byteStart + 16])[0]
         contentsStartOffset = 16
     if boxLengthValue == 0:
-        boxLengthValue = noBytes-byteStart
+        boxLengthValue = noBytes - byteStart
     byteEnd = byteStart + boxLengthValue
-    boxContents = data[byteStart+contentsStartOffset:byteEnd]
+    boxContents = data[byteStart + contentsStartOffset : byteEnd]
     return (boxLengthValue, boxType, byteEnd, boxContents)
 
 
 def parse_ihdr(data):
-    height = struct.unpack(">I", data[0:4])[0]
-    width = struct.unpack(">I", data[4:8])[0]
-    return width, height
+    height, width, channels, bpp = struct.unpack(">IIHB", data[:11])
+    return width, height, channels, bpp + 1
 
 
 def parse_colr(data):
@@ -52,14 +51,15 @@ def parse_colr(data):
     elif enumCS == 17:
         return "L"
     else:
-        raise Exception("only sRGB and greyscale color space is supported, "
-                        "got %d" % enumCS)
+        raise Exception(
+            "only sRGB and greyscale color space is supported, " "got %d" % enumCS
+        )
 
 
 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
 
 
@@ -69,9 +69,8 @@ def parse_res(data):
     byteStart = 0
     boxLengthValue = 1  # dummy value for while loop condition
     while byteStart < noBytes and boxLengthValue != 0:
-        boxLengthValue, boxType, byteEnd, boxContents = \
-            getBox(data, byteStart, noBytes)
-        if boxType == b'resc':
+        boxLengthValue, boxType, byteEnd, boxContents = getBox(data, byteStart, noBytes)
+        if boxType == b"resc":
             hdpi, vdpi = parse_resc(boxContents)
             break
     return hdpi, vdpi
@@ -83,16 +82,15 @@ def parse_jp2h(data):
     byteStart = 0
     boxLengthValue = 1  # dummy value for while loop condition
     while byteStart < noBytes and boxLengthValue != 0:
-        boxLengthValue, boxType, byteEnd, boxContents = \
-            getBox(data, byteStart, noBytes)
-        if boxType == b'ihdr':
-            width, height = parse_ihdr(boxContents)
-        elif boxType == b'colr':
+        boxLengthValue, boxType, byteEnd, boxContents = getBox(data, byteStart, noBytes)
+        if boxType == b"ihdr":
+            width, height, channels, bpp = parse_ihdr(boxContents)
+        elif boxType == b"colr":
             colorspace = parse_colr(boxContents)
-        elif boxType == b'res ':
+        elif boxType == b"res ":
             hdpi, vdpi = parse_res(boxContents)
         byteStart = byteEnd
-    return (width, height, colorspace, hdpi, vdpi)
+    return (width, height, colorspace, hdpi, vdpi, channels, bpp)
 
 
 def parsejp2(data):
@@ -101,10 +99,11 @@ def parsejp2(data):
     boxLengthValue = 1  # dummy value for while loop condition
     width, height, colorspace, hdpi, vdpi = None, None, None, None, None
     while byteStart < noBytes and boxLengthValue != 0:
-        boxLengthValue, boxType, byteEnd, boxContents = \
-            getBox(data, byteStart, noBytes)
-        if boxType == b'jp2h':
-            width, height, colorspace, hdpi, vdpi = parse_jp2h(boxContents)
+        boxLengthValue, boxType, byteEnd, boxContents = getBox(data, byteStart, noBytes)
+        if boxType == b"jp2h":
+            width, height, colorspace, hdpi, vdpi, channels, bpp = parse_jp2h(
+                boxContents
+            )
             break
         byteStart = byteEnd
     if not width:
@@ -114,12 +113,41 @@ 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)
+    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)
 
 
 if __name__ == "__main__":
     import sys
-    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)
+
+    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)

src/tests/__init__.py

@@ -1,718 +0,0 @@
-import unittest
-
-import img2pdf
-import os
-import struct
-import sys
-import zlib
-from PIL import Image
-from io import StringIO, BytesIO, TextIOWrapper
-
-HERE = os.path.dirname(__file__)
-
-PdfReaderIO = StringIO
-
-# Recompressing the image stream makes the comparison robust against output
-# preserving changes in the zlib compress output bitstream
-# (e.g. between different zlib implementations/versions/releases).
-# Without this, some img2pdf 0.3.2 tests fail on Fedora 29/aarch64.
-# See also:
-# https://gitlab.mister-muffin.de/josch/img2pdf/issues/51
-# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/R7GD4L5Z6HELCDAL2RDESWR2F3ZXHWVX/
-def recompress_last_stream(bs):
-    length_pos = bs.rindex(b'/Length')
-    li = length_pos + 8
-    lj = bs.index(b' ', li)
-    n = int(bs[li:lj])
-    stream_pos = bs.index(b'\nstream\n', lj)
-    si = stream_pos + 8
-    sj = si + n
-    startx_pos = bs.rindex(b'\nstartxref\n')
-    xi = startx_pos + 11
-    xj = bs.index(b'\n', xi)
-    m = int(bs[xi:xj])
-
-    unc_t = zlib.decompress(bs[si:sj])
-    t = zlib.compress(unc_t)
-
-    new_len = str(len(t)).encode('ascii')
-    u = (lj-li) + n
-    v = len(new_len) + len(t)
-    off = v - u
-
-    rs = (bs[:li] + new_len + bs[lj:si] + t + bs[sj:xi]
-            + str(m+off).encode('ascii') + bs[xj:])
-
-    return rs
-
-def compare_pdf(outx, outy):
-    if b'/FlateDecode' in outx:
-        x = recompress_last_stream(outx)
-        y = recompress_last_stream(outy)
-        if x != y:
-            print('original outx:\n{}\nouty:\n{}\n'.format(outx, outy), file=sys.stderr)
-            print('recompressed outx:\n{}\nouty:\n{}\n'.format(x, y), file=sys.stderr)
-            return False
-    else:
-        if outx != outy:
-            print('original outx:\n{}\nouty:\n{}\n'.format(outx, outy), file=sys.stderr)
-    return True
-
-# convert +set date:create +set date:modify -define png:exclude-chunk=time
-
-# we define some variables so that the table below can be narrower
-psl = (972, 504)     # --pagesize landscape
-psp = (504, 972)     # --pagesize portrait
-isl = (756, 324)     # --imgsize landscape
-isp = (324, 756)     # --imgsize portrait
-border = (162, 270)  # --border
-poster = (97200, 50400)
-# there is no need to have test cases with the same images with inverted
-# orientation (landscape/portrait) because --pagesize and --imgsize are
-# already inverted
-im1 = (864, 288)     # imgpx #1 => 648x216
-im2 = (1152, 576)    # imgpx #2 => 864x432
-# shortcuts for fit modes
-f_into = img2pdf.FitMode.into
-f_fill = img2pdf.FitMode.fill
-f_exact = img2pdf.FitMode.exact
-f_shrink = img2pdf.FitMode.shrink
-f_enlarge = img2pdf.FitMode.enlarge
-layout_test_cases = [
-    # psp=972x504, psl=504x972, isl=756x324, isp=324x756, border=162:270
-    # --pagesize   --border           -a pagepdf      imgpdf
-    #        --imgsize     --fit
-    (None, None, None,   f_into,    0, (648, 216),  (648, 216),    # 000
-                                       (864, 432),  (864, 432)),
-    (None, None, None,   f_into,    1, (648, 216),  (648, 216),    # 001
-                                       (864, 432),  (864, 432)),
-    (None, None, None,   f_fill,    0, (648, 216),  (648, 216),    # 002
-                                       (864, 432),  (864, 432)),
-    (None, None, None,   f_fill,    1, (648, 216),  (648, 216),    # 003
-                                       (864, 432),  (864, 432)),
-    (None, None, None,   f_exact,   0, (648, 216),  (648, 216),    # 004
-                                       (864, 432),  (864, 432)),
-    (None, None, None,   f_exact,   1, (648, 216),  (648, 216),    # 005
-                                       (864, 432),  (864, 432)),
-    (None, None, None,   f_shrink,  0, (648, 216),  (648, 216),    # 006
-                                       (864, 432),  (864, 432)),
-    (None, None, None,   f_shrink,  1, (648, 216),  (648, 216),    # 007
-                                       (864, 432),  (864, 432)),
-    (None, None, None,   f_enlarge, 0, (648, 216),  (648, 216),    # 008
-                                       (864, 432),  (864, 432)),
-    (None, None, None,   f_enlarge, 1, (648, 216),  (648, 216),    # 009
-                                       (864, 432),  (864, 432)),
-    (None, None, border, f_into,    0, (1188, 540), (648, 216),    # 010
-                                       (1404, 756), (864, 432)),
-    (None, None, border, f_into,    1, (1188, 540), (648, 216),    # 011
-                                       (1404, 756), (864, 432)),
-    (None, None, border, f_fill,    0, (1188, 540), (648, 216),    # 012
-                                       (1404, 756), (864, 432)),
-    (None, None, border, f_fill,    1, (1188, 540), (648, 216),    # 013
-                                       (1404, 756), (864, 432)),
-    (None, None, border, f_exact,   0, (1188, 540), (648, 216),    # 014
-                                       (1404, 756), (864, 432)),
-    (None, None, border, f_exact,   1, (1188, 540), (648, 216),    # 015
-                                       (1404, 756), (864, 432)),
-    (None, None, border, f_shrink,  0, (1188, 540), (648, 216),    # 016
-                                       (1404, 756), (864, 432)),
-    (None, None, border, f_shrink,  1, (1188, 540), (648, 216),    # 017
-                                       (1404, 756), (864, 432)),
-    (None, None, border, f_enlarge, 0, (1188, 540), (648, 216),    # 018
-                                       (1404, 756), (864, 432)),
-    (None, None, border, f_enlarge, 1, (1188, 540), (648, 216),    # 019
-                                       (1404, 756), (864, 432)),
-    (None, isp,  None,   f_into,    0, (324, 108),  (324, 108),    # 020
-                                       (324, 162),  (324, 162)),
-    (None, isp,  None,   f_into,    1, (324, 108),  (324, 108),    # 021
-                                       (324, 162),  (324, 162)),
-    (None, isp,  None,   f_fill,    0, (2268, 756), (2268, 756),   # 022
-                                       (1512, 756), (1512, 756)),
-    (None, isp,  None,   f_fill,    1, (2268, 756), (2268, 756),   # 023
-                                       (1512, 756), (1512, 756)),
-    (None, isp,  None,   f_exact,   0, (324, 756),  (324, 756),    # 024
-                                       (324, 756),  (324, 756)),
-    (None, isp,  None,   f_exact,   1, (324, 756),  (324, 756),    # 025
-                                       (324, 756),  (324, 756)),
-    (None, isp,  None,   f_shrink,  0, (324, 108),  (324, 108),    # 026
-                                       (324, 162),  (324, 162)),
-    (None, isp,  None,   f_shrink,  1, (324, 108),  (324, 108),    # 027
-                                       (324, 162),  (324, 162)),
-    (None, isp,  None,   f_enlarge, 0, (648, 216),  (648, 216),    # 028
-                                       (864, 432),  (864, 432)),
-    (None, isp,  None,   f_enlarge, 1, (648, 216),  (648, 216),    # 029
-                                       (864, 432),  (864, 432)),
-    (None, isp,  border, f_into,    0, (864, 432),  (324, 108),    # 030
-                                       (864, 486),  (324, 162)),
-    (None, isp,  border, f_into,    1, (864, 432),  (324, 108),    # 031
-                                       (864, 486),  (324, 162)),
-    (None, isp,  border, f_fill,    0, (2808, 1080), (2268, 756),  # 032
-                                       (2052, 1080), (1512, 756)),
-    (None, isp,  border, f_fill,    1, (2808, 1080), (2268, 756),  # 033
-                                       (2052, 1080), (1512, 756)),
-    (None, isp,  border, f_exact,   0, (864, 1080), (324, 756),    # 034
-                                       (864, 1080), (324, 756)),
-    (None, isp,  border, f_exact,   1, (864, 1080), (324, 756),    # 035
-                                       (864, 1080), (324, 756)),
-    (None, isp,  border, f_shrink,  0, (864, 432),  (324, 108),    # 036
-                                       (864, 486),  (324, 162)),
-    (None, isp,  border, f_shrink,  1, (864, 432),  (324, 108),    # 037
-                                       (864, 486),  (324, 162)),
-    (None, isp,  border, f_enlarge, 0, (1188, 540), (648, 216),    # 038
-                                       (1404, 756), (864, 432)),
-    (None, isp,  border, f_enlarge, 1, (1188, 540), (648, 216),    # 039
-                                       (1404, 756), (864, 432)),
-    (None, isl,  None,   f_into,    0, (756, 252),  (756, 252),    # 040
-                                       (648, 324),  (648, 324)),
-    (None, isl,  None,   f_into,    1, (756, 252),  (756, 252),    # 041
-                                       (648, 324),  (648, 324)),
-    (None, isl,  None,   f_fill,    0, (972, 324),  (972, 324),    # 042
-                                       (756, 378),  (756, 378)),
-    (None, isl,  None,   f_fill,    1, (972, 324),  (972, 324),    # 043
-                                       (756, 378),  (756, 378)),
-    (None, isl,  None,   f_exact,   0, (756, 324),  (756, 324),    # 044
-                                       (756, 324),  (756, 324)),
-    (None, isl,  None,   f_exact,   1, (756, 324),  (756, 324),    # 045
-                                       (756, 324),  (756, 324)),
-    (None, isl,  None,   f_shrink,  0, (648, 216),  (648, 216),    # 046
-                                       (648, 324),  (648, 324)),
-    (None, isl,  None,   f_shrink,  1, (648, 216),  (648, 216),    # 047
-                                       (648, 324),  (648, 324)),
-    (None, isl,  None,   f_enlarge, 0, (756, 252),  (756, 252),    # 048
-                                       (864, 432),  (864, 432)),
-    (None, isl,  None,   f_enlarge, 1, (756, 252),  (756, 252),    # 049
-                                       (864, 432),  (864, 432)),
-    # psp=972x504, psp=504x972, isl=756x324, isp=324x756, border=162:270
-    # --pagesize   --border           -a      pagepdf     imgpdf
-    #        --imgsize     --fit         imgpx
-    (None, isl,  border, f_into,    0, (1296, 576), (756, 252),    # 050
-                                       (1188, 648), (648, 324)),
-    (None, isl,  border, f_into,    1, (1296, 576), (756, 252),    # 051
-                                       (1188, 648), (648, 324)),
-    (None, isl,  border, f_fill,    0, (1512, 648), (972, 324),    # 052
-                                       (1296, 702), (756, 378)),
-    (None, isl,  border, f_fill,    1, (1512, 648), (972, 324),    # 053
-                                       (1296, 702), (756, 378)),
-    (None, isl,  border, f_exact,   0, (1296, 648), (756, 324),    # 054
-                                       (1296, 648), (756, 324)),
-    (None, isl,  border, f_exact,   1, (1296, 648), (756, 324),    # 055
-                                       (1296, 648), (756, 324)),
-    (None, isl,  border, f_shrink,  0, (1188, 540), (648, 216),    # 056
-                                       (1188, 648), (648, 324)),
-    (None, isl,  border, f_shrink,  1, (1188, 540), (648, 216),    # 057
-                                       (1188, 648), (648, 324)),
-    (None, isl,  border, f_enlarge, 0, (1296, 576), (756, 252),    # 058
-                                       (1404, 756), (864, 432)),
-    (None, isl,  border, f_enlarge, 1, (1296, 576), (756, 252),    # 059
-                                       (1404, 756), (864, 432)),
-    (psp,  None, None,   f_into,    0, (504, 972),  (504, 168),    # 060
-                                       (504, 972),  (504, 252)),
-    (psp,  None, None,   f_into,    1, (972, 504),  (972, 324),    # 061
-                                       (972, 504),  (972, 486)),
-    (psp,  None, None,   f_fill,    0, (504, 972),  (2916, 972),   # 062
-                                       (504, 972),  (1944, 972)),
-    (psp,  None, None,   f_fill,    1, (972, 504),  (1512, 504),   # 063
-                                       (972, 504),  (1008, 504)),
-    (psp,  None, None,   f_exact,   0, (504, 972),  (504, 972),    # 064
-                                       (504, 972),  (504, 972)),
-    (psp,  None, None,   f_exact,   1, (972, 504),  (972, 504),    # 065
-                                       (972, 504),  (972, 504)),
-    (psp,  None, None,   f_shrink,  0, (504, 972),  (504, 168),    # 066
-                                       (504, 972),  (504, 252)),
-    (psp,  None, None,   f_shrink,  1, (972, 504),  (648, 216),    # 067
-                                       (972, 504),  (864, 432)),
-    (psp,  None, None,   f_enlarge, 0, (504, 972),  (648, 216),    # 068
-                                       (504, 972),  (864, 432)),
-    (psp,  None, None,   f_enlarge, 1, (972, 504),  (972, 324),    # 069
-                                       (972, 504),  (972, 486)),
-    (psp,  None, border, f_into,    0, None,  None, None,  None),  # 070
-    (psp,  None, border, f_into,    1, None,  None, None,  None),  # 071
-    (psp,  None, border, f_fill,    0, (504, 972),  (1944, 648),   # 072
-                                       (504, 972),  (1296, 648)),
-    (psp,  None, border, f_fill,    1, (972, 504),  (648, 216),    # 073
-                                       (972, 504),  (648, 324)),
-    (psp,  None, border, f_exact,   0, None,  None, None,  None),  # 074
-    (psp,  None, border, f_exact,   1, None,  None, None,  None),  # 075
-    (psp,  None, border, f_shrink,  0, None,  None, None,  None),  # 076
-    (psp,  None, border, f_shrink,  1, None,  None, None,  None),  # 077
-    (psp,  None, border, f_enlarge, 0, (504, 972),  (648, 216),    # 078
-                                       (504, 972),  (864, 432)),
-    (psp,  None, border, f_enlarge, 1, (972, 504),  (648, 216),    # 079
-                                       (972, 504),  (864, 432)),
-    (psp,  isp,  None,   f_into,    0, (504, 972),  (324, 108),    # 080
-                                       (504, 972),  (324, 162)),
-    (psp,  isp,  None,   f_into,    1, (972, 504),  (324, 108),    # 081
-                                       (972, 504),  (324, 162)),
-    (psp,  isp,  None,   f_fill,    0, (504, 972),  (2268, 756),   # 082
-                                       (504, 972),  (1512, 756)),
-    (psp,  isp,  None,   f_fill,    1, (972, 504),  (2268, 756),   # 083
-                                       (972, 504),  (1512, 756)),
-    (psp,  isp,  None,   f_exact,   0, (504, 972),  (324, 756),    # 084
-                                       (504, 972),  (324, 756)),
-    (psp,  isp,  None,   f_exact,   1, (972, 504),  (324, 756),    # 085
-                                       (972, 504),  (324, 756)),
-    (psp,  isp,  None,   f_shrink,  0, (504, 972),  (324, 108),    # 086
-                                       (504, 972),  (324, 162)),
-    (psp,  isp,  None,   f_shrink,  1, (972, 504),  (324, 108),    # 087
-                                       (972, 504),  (324, 162)),
-    (psp,  isp,  None,   f_enlarge, 0, (504, 972),  (648, 216),    # 088
-                                       (504, 972),  (864, 432)),
-    (psp,  isp,  None,   f_enlarge, 1, (972, 504),  (648, 216),    # 089
-                                       (972, 504),  (864, 432)),
-    (psp,  isp,  border, f_into,    0, (504, 972),  (324, 108),    # 090
-                                       (504, 972),  (324, 162)),
-    (psp,  isp,  border, f_into,    1, (972, 504),  (324, 108),    # 091
-                                       (972, 504),  (324, 162)),
-    (psp,  isp,  border, f_fill,    0, (504, 972),  (2268, 756),   # 092
-                                       (504, 972),  (1512, 756)),
-    (psp,  isp,  border, f_fill,    1, (972, 504),  (2268, 756),   # 093
-                                       (972, 504),  (1512, 756)),
-    (psp,  isp,  border, f_exact,   0, (504, 972),  (324, 756),    # 094
-                                       (504, 972),  (324, 756)),
-    (psp,  isp,  border, f_exact,   1, (972, 504),  (324, 756),    # 095
-                                       (972, 504),  (324, 756)),
-    (psp,  isp,  border, f_shrink,  0, (504, 972),  (324, 108),    # 096
-                                       (504, 972),  (324, 162)),
-    (psp,  isp,  border, f_shrink,  1, (972, 504),  (324, 108),    # 097
-                                       (972, 504),  (324, 162)),
-    (psp,  isp,  border, f_enlarge, 0, (504, 972),  (648, 216),    # 098
-                                       (504, 972),  (864, 432)),
-    (psp,  isp,  border, f_enlarge, 1, (972, 504),  (648, 216),    # 099
-                                       (972, 504),  (864, 432)),
-    # psp=972x504, psp=504x972, isl=756x324, isp=324x756, border=162:270
-    # --pagesize   --border           -a      pagepdf    imgpdf
-    #        --imgsize     --fit         imgpx
-    (psp,  isl,  None,   f_into,    0, (504, 972),  (756, 252),    # 100
-                                       (504, 972),  (648, 324)),
-    (psp,  isl,  None,   f_into,    1, (972, 504),  (756, 252),    # 101
-                                       (972, 504),  (648, 324)),
-    (psp,  isl,  None,   f_fill,    0, (504, 972),  (972, 324),    # 102
-                                       (504, 972),  (756, 378)),
-    (psp,  isl,  None,   f_fill,    1, (972, 504),  (972, 324),    # 103
-                                       (972, 504),  (756, 378)),
-    (psp,  isl,  None,   f_exact,   0, (504, 972),  (756, 324),    # 104
-                                       (504, 972),  (756, 324)),
-    (psp,  isl,  None,   f_exact,   1, (972, 504),  (756, 324),    # 105
-                                       (972, 504),  (756, 324)),
-    (psp,  isl,  None,   f_shrink,  0, (504, 972),  (648, 216),    # 106
-                                       (504, 972),  (648, 324)),
-    (psp,  isl,  None,   f_shrink,  1, (972, 504),  (648, 216),    # 107
-                                       (972, 504),  (648, 324)),
-    (psp,  isl,  None,   f_enlarge, 0, (504, 972),  (756, 252),    # 108
-                                       (504, 972),  (864, 432)),
-    (psp,  isl,  None,   f_enlarge, 1, (972, 504),  (756, 252),    # 109
-                                       (972, 504),  (864, 432)),
-    (psp,  isl,  border, f_into,    0, (504, 972),  (756, 252),    # 110
-                                       (504, 972),  (648, 324)),
-    (psp,  isl,  border, f_into,    1, (972, 504),  (756, 252),    # 111
-                                       (972, 504),  (648, 324)),
-    (psp,  isl,  border, f_fill,    0, (504, 972),  (972, 324),    # 112
-                                       (504, 972),  (756, 378)),
-    (psp,  isl,  border, f_fill,    1, (972, 504),  (972, 324),    # 113
-                                       (972, 504),  (756, 378)),
-    (psp,  isl,  border, f_exact,   0, (504, 972),  (756, 324),    # 114
-                                       (504, 972),  (756, 324)),
-    (psp,  isl,  border, f_exact,   1, (972, 504),  (756, 324),    # 115
-                                       (972, 504),  (756, 324)),
-    (psp,  isl,  border, f_shrink,  0, (504, 972),  (648, 216),    # 116
-                                       (504, 972),  (648, 324)),
-    (psp,  isl,  border, f_shrink,  1, (972, 504),  (648, 216),    # 117
-                                       (972, 504),  (648, 324)),
-    (psp,  isl,  border, f_enlarge, 0, (504, 972),  (756, 252),    # 118
-                                       (504, 972),  (864, 432)),
-    (psp,  isl,  border, f_enlarge, 1, (972, 504),  (756, 252),    # 119
-                                       (972, 504),  (864, 432)),
-    (psl,  None, None,   f_into,    0, (972, 504),  (972, 324),    # 120
-                                       (972, 504),  (972, 486)),
-    (psl,  None, None,   f_into,    1, (972, 504),  (972, 324),    # 121
-                                       (972, 504),  (972, 486)),
-    (psl,  None, None,   f_fill,    0, (972, 504),  (1512, 504),   # 122
-                                       (972, 504),  (1008, 504)),
-    (psl,  None, None,   f_fill,    1, (972, 504),  (1512, 504),   # 123
-                                       (972, 504),  (1008, 504)),
-    (psl,  None, None,   f_exact,   0, (972, 504),  (972, 504),    # 124
-                                       (972, 504),  (972, 504)),
-    (psl,  None, None,   f_exact,   1, (972, 504),  (972, 504),    # 125
-                                       (972, 504),  (972, 504)),
-    (psl,  None, None,   f_shrink,  0, (972, 504),  (648, 216),    # 126
-                                       (972, 504),  (864, 432)),
-    (psl,  None, None,   f_shrink,  1, (972, 504),  (648, 216),    # 127
-                                       (972, 504),  (864, 432)),
-    (psl,  None, None,   f_enlarge, 0, (972, 504),  (972, 324),    # 128
-                                       (972, 504),  (972, 486)),
-    (psl,  None, None,   f_enlarge, 1, (972, 504),  (972, 324),    # 129
-                                       (972, 504),  (972, 486)),
-    (psl,  None, border, f_into,    0, (972, 504),  (432, 144),    # 130
-                                       (972, 504),  (360, 180)),
-    (psl,  None, border, f_into,    1, (972, 504),  (432, 144),    # 131
-                                       (972, 504),  (360, 180)),
-    (psl,  None, border, f_fill,    0, (972, 504),  (540, 180),    # 132
-                                       (972, 504),  (432, 216)),
-    (psl,  None, border, f_fill,    1, (972, 504),  (540, 180),    # 133
-                                       (972, 504),  (432, 216)),
-    (psl,  None, border, f_exact,   0, (972, 504),  (432, 180),    # 134
-                                       (972, 504),  (432, 180)),
-    (psl,  None, border, f_exact,   1, (972, 504),  (432, 180),    # 135
-                                       (972, 504),  (432, 180)),
-    (psl,  None, border, f_shrink,  0, (972, 504),  (432, 144),    # 136
-                                       (972, 504),  (360, 180)),
-    (psl,  None, border, f_shrink,  1, (972, 504),  (432, 144),    # 137
-                                       (972, 504),  (360, 180)),
-    (psl,  None, border, f_enlarge, 0, (972, 504),  (648, 216),    # 138
-                                       (972, 504),  (864, 432)),
-    (psl,  None, border, f_enlarge, 1, (972, 504),  (648, 216),    # 139
-                                       (972, 504),  (864, 432)),
-    (psl,  isp,  None,   f_into,    0, (972, 504),  (324, 108),    # 140
-                                       (972, 504),  (324, 162)),
-    (psl,  isp,  None,   f_into,    1, (972, 504),  (324, 108),    # 141
-                                       (972, 504),  (324, 162)),
-    (psl,  isp,  None,   f_fill,    0, (972, 504),  (2268, 756),   # 142
-                                       (972, 504),  (1512, 756)),
-    (psl,  isp,  None,   f_fill,    1, (972, 504),  (2268, 756),   # 143
-                                       (972, 504),  (1512, 756)),
-    (psl,  isp,  None,   f_exact,   0, (972, 504),  (324, 756),    # 144
-                                       (972, 504),  (324, 756)),
-    (psl,  isp,  None,   f_exact,   1, (972, 504),  (324, 756),    # 145
-                                       (972, 504),  (324, 756)),
-    (psl,  isp,  None,   f_shrink,  0, (972, 504),  (324, 108),    # 146
-                                       (972, 504),  (324, 162)),
-    (psl,  isp,  None,   f_shrink,  1, (972, 504),  (324, 108),    # 147
-                                       (972, 504),  (324, 162)),
-    (psl,  isp,  None,   f_enlarge, 0, (972, 504),  (648, 216),    # 148
-                                       (972, 504),  (864, 432)),
-    (psl,  isp,  None,   f_enlarge, 1, (972, 504),  (648, 216),    # 149
-                                       (972, 504),  (864, 432)),
-    # psp=972x504, psl=504x972, isl=756x324, isp=324x756, border=162:270
-    # --pagesize   --border           -a      pagepdf     imgpdf
-    #        --imgsize     --fit         imgpx
-    (psl,  isp,  border, f_into,    0, (972, 504),  (324, 108),    # 150
-                                       (972, 504),  (324, 162)),
-    (psl,  isp,  border, f_into,    1, (972, 504),  (324, 108),    # 151
-                                       (972, 504),  (324, 162)),
-    (psl,  isp,  border, f_fill,    0, (972, 504),  (2268, 756),   # 152
-                                       (972, 504),  (1512, 756)),
-    (psl,  isp,  border, f_fill,    1, (972, 504),  (2268, 756),   # 153
-                                       (972, 504),  (1512, 756)),
-    (psl,  isp,  border, f_exact,   0, (972, 504),  (324, 756),    # 154
-                                       (972, 504),  (324, 756)),
-    (psl,  isp,  border, f_exact,   1, (972, 504),  (324, 756),    # 155
-                                       (972, 504),  (324, 756)),
-    (psl,  isp,  border, f_shrink,  0, (972, 504),  (324, 108),    # 156
-                                       (972, 504),  (324, 162)),
-    (psl,  isp,  border, f_shrink,  1, (972, 504),  (324, 108),    # 157
-                                       (972, 504),  (324, 162)),
-    (psl,  isp,  border, f_enlarge, 0, (972, 504),  (648, 216),    # 158
-                                       (972, 504),  (864, 432)),
-    (psl,  isp,  border, f_enlarge, 1, (972, 504),  (648, 216),    # 159
-                                       (972, 504),  (864, 432)),
-    (psl,  isl,  None,   f_into,    0, (972, 504),  (756, 252),    # 160
-                                       (972, 504),  (648, 324)),
-    (psl,  isl,  None,   f_into,    1, (972, 504),  (756, 252),    # 161
-                                       (972, 504),  (648, 324)),
-    (psl,  isl,  None,   f_fill,    0, (972, 504),  (972, 324),    # 162
-                                       (972, 504),  (756, 378)),
-    (psl,  isl,  None,   f_fill,    1, (972, 504),  (972, 324),    # 163
-                                       (972, 504),  (756, 378)),
-    (psl,  isl,  None,   f_exact,   0, (972, 504),  (756, 324),    # 164
-                                       (972, 504),  (756, 324)),
-    (psl,  isl,  None,   f_exact,   1, (972, 504),  (756, 324),    # 165
-                                       (972, 504),  (756, 324)),
-    (psl,  isl,  None,   f_shrink,  0, (972, 504),  (648, 216),    # 166
-                                       (972, 504),  (648, 324)),
-    (psl,  isl,  None,   f_shrink,  1, (972, 504),  (648, 216),    # 167
-                                       (972, 504),  (648, 324)),
-    (psl,  isl,  None,   f_enlarge, 0, (972, 504),  (756, 252),    # 168
-                                       (972, 504),  (864, 432)),
-    (psl,  isl,  None,   f_enlarge, 1, (972, 504),  (756, 252),    # 169
-                                       (972, 504),  (864, 432)),
-    (psl,  isl,  border, f_into,    0, (972, 504),  (756, 252),    # 170
-                                       (972, 504),  (648, 324)),
-    (psl,  isl,  border, f_into,    1, (972, 504),  (756, 252),    # 171
-                                       (972, 504),  (648, 324)),
-    (psl,  isl,  border, f_fill,    0, (972, 504),  (972, 324),    # 172
-                                       (972, 504),  (756, 378)),
-    (psl,  isl,  border, f_fill,    1, (972, 504),  (972, 324),    # 173
-                                       (972, 504),  (756, 378)),
-    (psl,  isl,  border, f_exact,   0, (972, 504),  (756, 324),    # 174
-                                       (972, 504),  (756, 324)),
-    (psl,  isl,  border, f_exact,   1, (972, 504),  (756, 324),    # 175
-                                       (972, 504),  (756, 324)),
-    (psl,  isl,  border, f_shrink,  0, (972, 504),  (648, 216),    # 176
-                                       (972, 504),  (648, 324)),
-    (psl,  isl,  border, f_shrink,  1, (972, 504),  (648, 216),    # 177
-                                       (972, 504),  (648, 324)),
-    (psl,  isl,  border, f_enlarge, 0, (972, 504),  (756, 252),    # 178
-                                       (972, 504),  (864, 432)),
-    (psl,  isl,  border, f_enlarge, 1, (972, 504),  (756, 252),    # 179
-                                       (972, 504),  (864, 432)),
-    (poster, None, None, f_fill,    0, (97200, 50400), (151200, 50400),
-                                       (97200, 50400), (100800, 50400)),
-]
-
-
-def tiff_header_for_ccitt(width, height, img_size, ccitt_group=4):
-    # Quick and dirty TIFF header builder from
-    # https://stackoverflow.com/questions/2641770
-    tiff_header_struct = '<' + '2s' + 'h' + 'l' + 'h' + 'hhll' * 8 + 'h'
-    return struct.pack(
-        tiff_header_struct,
-        b'II',  # Byte order indication: Little indian
-        42,  # Version number (always 42)
-        8,  # Offset to first IFD
-        8,  # Number of tags in IFD
-        256, 4, 1, width,  # ImageWidth, LONG, 1, width
-        257, 4, 1, height,  # ImageLength, LONG, 1, lenght
-        258, 3, 1, 1,  # BitsPerSample, SHORT, 1, 1
-        259, 3, 1, ccitt_group,  # Compression, SHORT, 1, 4 = CCITT Group 4
-        262, 3, 1, 1,  # Threshholding, SHORT, 1, 0 = WhiteIsZero
-        273, 4, 1, struct.calcsize(
-            tiff_header_struct),  # StripOffsets, LONG, 1, len of header
-        278, 4, 1, height,  # RowsPerStrip, LONG, 1, lenght
-        279, 4, 1, img_size,  # StripByteCounts, LONG, 1, size of image
-        0  # last IFD
-        )
-
-
-class CommandLineTests(unittest.TestCase):
-    def test_main_help(self):
-        from contextlib import redirect_stdout
-        f = StringIO()
-        with redirect_stdout(f):
-            try:
-                img2pdf.main(['img2pdf', '--help'])
-            except SystemExit:
-                pass
-        res = f.getvalue()
-        self.assertIn('img2pdf', res)
-
-
-def test_suite():
-    class TestImg2Pdf(unittest.TestCase):
-        pass
-
-    for i, (psopt, isopt, border, fit, ao, pspdf1, ispdf1,
-            pspdf2, ispdf2) in enumerate(layout_test_cases):
-        if isopt is not None:
-            isopt = ((img2pdf.ImgSize.abs, isopt[0]),
-                     (img2pdf.ImgSize.abs, isopt[1]))
-
-        def layout_handler(
-                self, psopt, isopt, border, fit, ao, pspdf, ispdf, im):
-            layout_fun = img2pdf.get_layout_fun(psopt, isopt, border, fit, ao)
-            try:
-                pwpdf, phpdf, iwpdf, ihpdf = \
-                    layout_fun(im[0], im[1], (img2pdf.default_dpi,
-                                              img2pdf.default_dpi))
-                self.assertEqual((pwpdf, phpdf), pspdf)
-                self.assertEqual((iwpdf, ihpdf), ispdf)
-            except img2pdf.NegativeDimensionError:
-                self.assertEqual(None, pspdf)
-                self.assertEqual(None, ispdf)
-
-        def layout_handler_im1(self, psopt=psopt, isopt=isopt, border=border,
-                               fit=fit, ao=ao, pspdf=pspdf1, ispdf=ispdf1):
-            layout_handler(self, psopt, isopt, border, fit, ao, pspdf, ispdf,
-                           im1)
-        setattr(TestImg2Pdf, "test_layout_%03d_im1" % i, layout_handler_im1)
-
-        def layout_handler_im2(self, psopt=psopt, isopt=isopt, border=border,
-                               fit=fit, ao=ao, pspdf=pspdf2, ispdf=ispdf2):
-            layout_handler(self, psopt, isopt, border, fit, ao, pspdf, ispdf,
-                           im2)
-        setattr(TestImg2Pdf, "test_layout_%03d_im2" % i, layout_handler_im2)
-
-    files = os.listdir(os.path.join(HERE, "input"))
-    for with_pdfrw, test_name in [(a, b) for a in [True, False]
-                                  for b in files]:
-        # we do not test animation.gif with pdfrw because it doesn't support
-        # saving hexadecimal palette data
-        if test_name == 'animation.gif' and with_pdfrw:
-            continue
-        inputf = os.path.join(HERE, "input", test_name)
-        if not os.path.isfile(inputf):
-            continue
-        outputf = os.path.join(HERE, "output", test_name+".pdf")
-        assert os.path.isfile(outputf)
-
-        def handle(self, f=inputf, out=outputf, with_pdfrw=with_pdfrw):
-            try:
-                from pdfrw import PdfReader, PdfName, PdfWriter
-                from pdfrw.py23_diffs import convert_load, convert_store
-            except ImportError:
-                # the test requires pdfrw
-                self.skipTest("this test requires pdfrw")
-                return
-            with open(f, "rb") as inf:
-                orig_imgdata = inf.read()
-            output = img2pdf.convert(orig_imgdata, nodate=True,
-                                     with_pdfrw=with_pdfrw)
-            x = PdfReader(PdfReaderIO(convert_load(output)))
-            self.assertEqual(sorted(x.keys()), [PdfName.Info, PdfName.Root,
-                             PdfName.Size])
-            self.assertIn(x.Root.Pages.Count, ('1', '2'))
-            if len(x.Root.Pages.Kids) == '1':
-                self.assertEqual(x.Size, '7')
-                self.assertEqual(len(x.Root.Pages.Kids), 1)
-            elif len(x.Root.Pages.Kids) == '2':
-                self.assertEqual(x.Size, '10')
-                self.assertEqual(len(x.Root.Pages.Kids), 2)
-            self.assertEqual(x.Info, {})
-            self.assertEqual(sorted(x.Root.keys()), [PdfName.Pages,
-                                                     PdfName.Type])
-            self.assertEqual(x.Root.Type, PdfName.Catalog)
-            self.assertEqual(sorted(x.Root.Pages.keys()),
-                             [PdfName.Count, PdfName.Kids, PdfName.Type])
-            self.assertEqual(x.Root.Pages.Type, PdfName.Pages)
-            orig_img = Image.open(f)
-            for pagenum in range(len(x.Root.Pages.Kids)):
-                # retrieve the original image frame that this page was
-                # generated from
-                orig_img.seek(pagenum)
-                cur_page = x.Root.Pages.Kids[pagenum]
-
-                ndpi = orig_img.info.get("dpi", (96.0, 96.0))
-                # 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])))
-                imgwidthpx, imgheightpx = orig_img.size
-                pagewidth = 72.0*imgwidthpx/ndpi[0]
-                pageheight = 72.0*imgheightpx/ndpi[1]
-
-                def format_float(f):
-                    if int(f) == f:
-                        return str(int(f))
-                    else:
-                        return ("%.4f" % f).rstrip("0")
-
-                self.assertEqual(sorted(cur_page.keys()),
-                                 [PdfName.Contents, PdfName.MediaBox,
-                                  PdfName.Parent, PdfName.Resources,
-                                  PdfName.Type])
-                self.assertEqual(cur_page.MediaBox,
-                                 ['0', '0', format_float(pagewidth),
-                                  format_float(pageheight)])
-                self.assertEqual(cur_page.Parent, x.Root.Pages)
-                self.assertEqual(cur_page.Type, PdfName.Page)
-                self.assertEqual(cur_page.Resources.keys(),
-                                 [PdfName.XObject])
-                self.assertEqual(cur_page.Resources.XObject.keys(),
-                                 [PdfName.Im0])
-                self.assertEqual(cur_page.Contents.keys(),
-                                 [PdfName.Length])
-                self.assertEqual(cur_page.Contents.Length,
-                                 str(len(cur_page.Contents.stream)))
-                self.assertEqual(cur_page.Contents.stream,
-                                 "q\n%.4f 0 0 %.4f 0.0000 0.0000 cm\n"
-                                 "/Im0 Do\nQ" % (pagewidth, pageheight))
-
-                imgprops = cur_page.Resources.XObject.Im0
-
-                # test if the filter is valid:
-                self.assertIn(
-                    imgprops.Filter, [PdfName.DCTDecode, PdfName.JPXDecode,
-                                      PdfName.FlateDecode,
-                                      [PdfName.CCITTFaxDecode]])
-
-                # test if the image has correct size
-                self.assertEqual(imgprops.Width, str(orig_img.size[0]))
-                self.assertEqual(imgprops.Height, str(orig_img.size[1]))
-                # if the input file is a jpeg then it should've been copied
-                # verbatim into the PDF
-                if imgprops.Filter in [PdfName.DCTDecode,
-                                       PdfName.JPXDecode]:
-                    self.assertEqual(
-                        cur_page.Resources.XObject.Im0.stream,
-                        convert_load(orig_imgdata))
-                elif imgprops.Filter == [PdfName.CCITTFaxDecode]:
-                    tiff_header = tiff_header_for_ccitt(
-                        int(imgprops.Width), int(imgprops.Height),
-                        int(imgprops.Length), 4)
-                    imgio = BytesIO()
-                    imgio.write(tiff_header)
-                    imgio.write(convert_store(
-                        cur_page.Resources.XObject.Im0.stream))
-                    imgio.seek(0)
-                    im = Image.open(imgio)
-                    self.assertEqual(im.tobytes(), orig_img.tobytes())
-                    try:
-                        im.close()
-                    except AttributeError:
-                        pass
-
-                elif imgprops.Filter == PdfName.FlateDecode:
-                    # otherwise, the data is flate encoded and has to be equal
-                    # to the pixel data of the input image
-                    imgdata = zlib.decompress(
-                        convert_store(cur_page.Resources.XObject.Im0.stream))
-                    if imgprops.DecodeParms:
-                        if orig_img.format == 'PNG':
-                            pngidat, palette = img2pdf.parse_png(orig_imgdata)
-                        elif orig_img.format == 'TIFF' \
-                                and orig_img.info['compression'] == "group4":
-                            offset, length = \
-                                    img2pdf.ccitt_payload_location_from_pil(
-                                            orig_img)
-                            pngidat = orig_imgdata[offset:offset+length]
-                        else:
-                            pngbuffer = BytesIO()
-                            orig_img.save(pngbuffer, format="png")
-                            pngidat, palette = img2pdf.parse_png(
-                                    pngbuffer.getvalue())
-                        self.assertEqual(zlib.decompress(pngidat), imgdata)
-                    else:
-                        colorspace = imgprops.ColorSpace
-                        if colorspace == PdfName.DeviceGray:
-                            colorspace = 'L'
-                        elif colorspace == PdfName.DeviceRGB:
-                            colorspace = 'RGB'
-                        elif colorspace == PdfName.DeviceCMYK:
-                            colorspace = 'CMYK'
-                        else:
-                            raise Exception("invalid colorspace")
-                        im = Image.frombytes(colorspace,
-                                             (int(imgprops.Width),
-                                              int(imgprops.Height)),
-                                             imgdata)
-                        if orig_img.mode == '1':
-                            self.assertEqual(im.tobytes(),
-                                             orig_img.convert("L").tobytes())
-                        elif orig_img.mode not in ("RGB", "L", "CMYK",
-                                                   "CMYK;I"):
-                            self.assertEqual(im.tobytes(),
-                                             orig_img.convert("RGB").tobytes())
-                        # the python-pil version 2.3.0-1ubuntu3 in Ubuntu does
-                        # not have the close() method
-                        try:
-                            im.close()
-                        except AttributeError:
-                            pass
-            # now use pdfrw to parse and then write out both pdfs and check the
-            # result for equality
-            y = PdfReader(out)
-            outx = BytesIO()
-            outy = BytesIO()
-            xwriter = PdfWriter()
-            ywriter = PdfWriter()
-            xwriter.trailer = x
-            ywriter.trailer = y
-            xwriter.write(outx)
-            ywriter.write(outy)
-            self.assertEqual(compare_pdf(outx.getvalue(), outy.getvalue()), True)
-            # the python-pil version 2.3.0-1ubuntu3 in Ubuntu does not have the
-            # close() method
-            try:
-                orig_img.close()
-            except AttributeError:
-                pass
-        if with_pdfrw:
-            setattr(TestImg2Pdf, "test_%s_with_pdfrw" % test_name, handle)
-        else:
-            setattr(TestImg2Pdf, "test_%s_without_pdfrw" % test_name, handle)
-
-    return unittest.TestSuite((
-            unittest.makeSuite(TestImg2Pdf),
-            unittest.makeSuite(CommandLineTests),
-            ))

tox.ini

@@ -1,9 +1,18 @@
+# tox (https://tox.readthedocs.io/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
 [tox]
-envlist = py27,py35,pypy
+envlist = py37, py38, py39, py310
+skip_missing_interpreters = true
 
 [testenv]
 deps =
-    .[test]
+    pdfrw
+    pytest
+    pikepdf
+    numpy
+    scipy
 commands =
-    python setup.py test -q
-
+    python -m pytest -vv