v7.0.4 notes

Error was
TypeError: unsupported operand type(s) for -: 'tuple' and 'int'

docs/installation.rst

@@ -55,13 +55,13 @@ Users of Debian 9 ("stretch") or later or Ubuntu 16.10 or later may simply
 
     apt-get install ocrmypdf
 
-For full details on version availability, check the `Debian Package Tracker <https://tracker.debian.org/pkg/ocrmypdf>`_ or `Ubuntu launchpad.net <https://launchpad.net/ocrmypdf>`_.
+As indicated in the table above, Debian and Ubuntu releases may lag behind the latest version. If the version available for your platform is out of date, you could opt to install the latest version from source. See `Installing HEAD revision from sources`_.
 
-If the version available for your platform is out of date, you could opt to install the latest version from source. See `Installing HEAD revision from sources`_.
+For full details on version availability for your platform, check the `Debian Package Tracker <https://tracker.debian.org/pkg/ocrmypdf>`_ or `Ubuntu launchpad.net <https://launchpad.net/ocrmypdf>`_.
 
 .. note::
 
-    OCRmyPDF for Debian and Ubuntu currently omit the JBIG2 encoder. OCRmyPDF works fine without it but will produce larger output files. If you build jbig2enc from source, ocrmypdf 7.0.0 and later will automatically detect it on the ``PATH``. To add JBIG2 encoding, see `Installing the JBIG2 encoder`_.
+    OCRmyPDF for Debian and Ubuntu currently omit the JBIG2 encoder. OCRmyPDF works fine without it but will produce larger output files. If you build jbig2enc from source, ocrmypdf 7.0.0 and later will automatically detect it (specifically the ``jbig2`` binary) on the ``PATH``. To add JBIG2 encoding, see `Installing the JBIG2 encoder`_.
 
 Installing the latest version on Ubuntu 18.04 LTS
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -447,12 +447,12 @@ Since ``pip3 install --user`` does not work correctly on some platforms, notably
 Requirements for pip and HEAD install
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-OCRmyPDF currently requires these external programs and libraries to be installed:
+OCRmyPDF currently requires these external programs and libraries to be installed, and must be satisfied using the operating system package manager. ``pip`` cannot provide them.
 
 - Python 3.5 or newer
 - Ghostscript 9.15 or newer
 - libexempi3 2.2.0 or newer
-- qpdf 7.0.0 or newer
+- qpdf 8.1.0 or newer
 - Tesseract 3.04 or newer
 
 As of ocrmypdf 7.0.0, the following versions are recommended:
@@ -484,6 +484,8 @@ Installing HEAD revision from sources
 
 If you have ``git`` and Python 3.5 or newer installed, you can install from source. When the ``pip`` installer runs, it will alert you if dependencies are missing.
 
+If you prefer to build every from source, you will need to `build pikepdf from source <https://pikepdf.readthedocs.io/en/latest/installation.html#building-from-source>`_. First ensure you can build and install pikepdf.
+
 To install the HEAD revision from sources in the current Python 3 environment:
 
 .. code-block:: bash

docs/jbig2.rst

@@ -1,4 +1,4 @@
-Installing a JBIG2 encoder
+Installing the JBIG2 encoder
 ==========================
 
 Most Linux distributions do not include a JBIG2 encoder since JBIG2 encoding was patented for a long time. All known JBIG2 US patents have expired as of 2017, but it is possible that unknown patents exist.

docs/release_notes.rst

@@ -13,6 +13,21 @@ Note that it is licensed under GPLv3, so scripts that ``import ocrmypdf`` and ar
    find:    [^`]\#([0-9]{1,3})[^0-9]
    replace: `#$1 <https://github.com/jbarlow83/OCRmyPDF/issues/$1>`_
 
+v7.0.4
+------
+
+-   Fix exception thrown when trying to optimize a certain type of PNG embedded
+in a PDF with the ``-O2``
+
+-   Update to pikepdf 0.3.2, to gain support for optimizing some additional
+image types that were previously excluded from optimization (CMYK and grayscale).
+Fixes `#285 <https://github.com/jbarlow83/OCRmyPDF/issues/285>`_.
+
+v7.0.3
+------
+
+-   Fix issue `#284 <https://github.com/jbarlow83/OCRmyPDF/issues/284>`_, an error when parsing inline images that have are also image masks, by upgrading pikepdf to 0.3.1
+
 v7.0.2
 ------
 

setup.py

@@ -241,6 +241,7 @@ setup(
         'cffi >= 1.9.1',        # to build the leptonica module
         'pytest-runner',        # to enable python setup.py test
         'setuptools_scm',       # so that version will work
+        'setuptools_scm_git_archive'    # enable version from github tarballs
     ],
     use_scm_version={'version_scheme': 'post-release'},
     cffi_modules=[
@@ -249,7 +250,7 @@ setup(
     install_requires=[
         'cffi >= 1.9.1',          # must be a setup and install requirement
         'img2pdf >= 0.2.4, < 0.4',       # pure Python, so track HEAD closely
-        'pikepdf >= 0.2.2, < 0.4',
+        'pikepdf >= 0.3.2, < 0.4',
         'Pillow >= 4.0.0, != 5.1.0 ; sys_platform == "darwin"',
                                   # Pillow < 4 has BytesIO/TIFF bug w/img2pdf 0.2.3
                                   # block 5.1.0, broken wheels

src/ocrmypdf/optimize.py

@@ -24,11 +24,6 @@ import sys
 from PIL import Image
 
 import pikepdf
-try:
-    from pikepdf import Null  # pikepdf <= 0.2.2
-except ImportError:
-    def Null():               # pikepdf > 0.2.2
-        return None
 
 from ._jobcontext import JobContext
 from . import leptonica
@@ -37,7 +32,7 @@ from .exec import pngquant, jbig2enc
 
 PAGE_GROUP_SIZE = 10
 DEFAULT_JPEG_QUALITY = 75
-DEFAULT_PNG_QUALITY = (65, 75)
+DEFAULT_PNG_QUALITY = 70
 
 
 def img_name(root, xref, ext):
@@ -245,8 +240,7 @@ def transcode_jpegs(pike, jpegs, root, log, options):
         compdata = leptonica.CompressedData.open(opt_jpg)
         im_obj = pike.get_object(xref, 0)
         im_obj.write(
-            compdata.read(), pikepdf.Name('/DCTDecode'),
-            Null()
+            compdata.read(), filter=pikepdf.Name('/DCTDecode')
         )
 
 
@@ -286,7 +280,7 @@ def transcode_pngs(pike, pngs, root, log, options):
         if len(compdata) > int(im_obj.stream_dict.Length):
             continue  # If we produced a larger image, don't use
 
-        predictor = Null()
+        predictor = None
         if compdata.predictor > 0:
             predictor = pikepdf.Dictionary({'/Predictor': compdata.predictor})
 
@@ -309,7 +303,10 @@ def transcode_pngs(pike, pngs, root, log, options):
             elif compdata.spp == 4:
                 cs = pikepdf.Name('/DeviceCMYK')
         im_obj.ColorSpace = cs
-        im_obj.write(compdata.read(), pikepdf.Name('/FlateDecode'), predictor)
+        im_obj.write(
+            compdata.read(),
+            filter=pikepdf.Name('/FlateDecode'), decode_parms=predictor
+        )
 
 
 def optimize(