v14.0.2

This logs the "done" message if neither delete nor archive options are set.

.docker/Dockerfile

@@ -57,6 +57,7 @@ RUN add-apt-repository -y ppa:alex-p/tesseract-ocr-devel
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
   ghostscript \
+  jbig2dec \
   img2pdf \
   libsm6 libxext6 libxrender-dev \
   pngquant \

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,5 +1,3 @@
-# SPDX-FileCopyrightText: 2022 James R. Barlow
-# SPDX-License-Identifier: CC-BY-SA-4.0
 ---
 name: Feature request
 about: Suggest an idea for this project
@@ -19,11 +17,7 @@ A clear and concise description of what you want to happen.
 A clear and concise description of any alternative solutions or features you've considered. Please include the versions of OCRmyPDF and other supporting programs (Tesseract OCR, Ghostscript) - maybe an alternative already exists in a newer version.
 
 **Example file**
-If your issue concerns how OCRmyPDF processes certain files, and please provide an example file that helps illustrate how OCRmyPDF's output could be improve.
+If your issue concerns how OCRmyPDF processes certain files, and please provide an example file that helps illustrate how OCRmyPDF's output could be improve. You could also look in ``tests/resources`` and see if any of those files demonstrates your issue.
-
-Please provide an input file with no personal or confidential information. At your option you may [GPG-encrypt the file](https://github.com/ocrmypdf/OCRmyPDF/wiki) for OCRmyPDF's author only.
-
-Links to files hosted elsewhere are perfectly acceptable. You could also look in ``tests/resources`` and see if any of those files reproduce your issue.
 
 **Additional context**
 Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/general-issues.md

@@ -1,9 +1,7 @@
-# SPDX-FileCopyrightText: 2022 James R. Barlow
-# SPDX-License-Identifier: CC-BY-SA-4.0
 ---
 name: General issues
 about: Installation, packages, dependencies, "nothing works", test suite failures...
-title: ''
+title: "[BUG]"
 labels: ''
 assignees: ''
 
@@ -25,6 +23,7 @@ If applicable, add screenshots to help explain your problem.
  - OS:
  - Python version:
  - OCRmyPDF version:
+ - Platform: x64 or ARM
 
 **Installation**
 How did you install OCRmyPDF? Did you install it from your operating system's

.github/ISSUE_TEMPLATE/problem-with-specific-file.md

@@ -1,9 +1,7 @@
-# SPDX-FileCopyrightText: 2022 James R. Barlow
-# SPDX-License-Identifier: CC-BY-SA-4.0
 ---
-name: Problem with a specific input file
+name: Problem with specific file
 about: Something went wrong while trying to OCR a specific file
-title: ''
+title: "[BUG]"
 labels: ''
 assignees: ''
 

.github/workflows/build.yml

@@ -33,7 +33,7 @@ jobs:
           - os: ubuntu-latest
             python: "3.10"
           - os: ubuntu-latest
-            python: "3.11.0-rc.2 - 3.11.0"
+            python: "3.11"
           # - os: ubuntu-latest
           #   python: "pypy3.8"
           #- os: ubuntu-latest
@@ -122,7 +122,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest]
-        python: ["3.9", "3.10"] # 2022-09-20: pikepdf/lxml not available for cp311
+        python: ["3.10", "3.11"]
 
     env:
       OS: ${{ matrix.os }}
@@ -133,12 +133,8 @@ jobs:
         with:
           fetch-depth: "0" # 0=all, needed for setuptools-scm to resolve version tags
 
-      - uses: actions/setup-python@v4
-        name: Install Python
-        with:
-          python-version: ${{ matrix.python }}
-
       - name: Install Homebrew deps
+        continue-on-error: true
         run: |
           brew update
           brew install \
@@ -149,6 +145,11 @@ jobs:
             pngquant \
             tesseract
 
+      - uses: actions/setup-python@v4
+        name: Install Python
+        with:
+          python-version: ${{ matrix.python }}
+
       - name: Install Python packages
         run: |
           python -m pip install --upgrade pip wheel
@@ -177,7 +178,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest]
-        python: ["3.9", "3.10"] # 2022-09-20: pikepdf/lxml not available for cp311
+        python: ["3.10", "3.11"]
 
     env:
       OS: ${{ matrix.os }}

.reuse/dep5

@@ -16,6 +16,7 @@ Copyright: (C) 2022 James R. Barlow
 License: MPL-2.0
 
 Files:
+ .github/ISSUE_TEMPLATE/*.md
  docs/images/macos-workflow.png
 Copyright: (C) 2022 James R. Barlow
 License: CC-BY-SA-4.0

docs/advanced.rst

@@ -160,7 +160,7 @@ Changing tesseract configuration variables
 ------------------------------------------
 
 You can override tesseract's default `control
-parameters <https://github.com/tesseract-ocr/tesseract/wiki/ControlParams>`__
+parameters <https://tesseract-ocr.github.io/tessdoc/tess3/ControlParams.html>`__
 with a configuration file.
 
 As an example, this configuration will disable Tesseract's dictionary

docs/batch.rst

@@ -21,8 +21,8 @@ processors. To maximize parallelism without overloading your system with
 processes, consider using ``parallel -j 2`` to limit parallel to running
 two jobs at once.
 
-This command will run all ocrmypdf all files named ``*.pdf`` in the
+This command will run ``ocrmypdf`` on all files named ``*.pdf`` in the
-current directory and write them to the previous created ``output/``
+current directory and write them to the previously created ``output/``
 folder. It will not search subdirectories.
 
 The ``--tag`` argument tells parallel to print the filename as a prefix

docs/installation.rst

@@ -375,8 +375,8 @@ Native Windows
 You must install the following for Windows:
 
 * Python 3.8 (64-bit) or later
-* Tesseract 4.1.1 or later
+* Tesseract 4.1.1 (64-bit) or later
-* Ghostscript 9.50 or later
+* Ghostscript 9.50 (64-bit) or later
 
 Using the `Chocolatey <https://chocolatey.org/>`_ package manager, install the
 following when running in an Administrator command prompt:
@@ -395,10 +395,8 @@ Administrator.):
 
 * ``pip install ocrmypdf``
 
-Chocolatey automatically selects appropriate versions of these applications. If you
+Chocolatey automatically selects appropriate versions of these applications. Please make sure
-are installing them manually, please install 64-bit versions of all applications for
+you are installing the 64-bit versions.
-64-bit Windows, or 32-bit versions of all applications for 32-bit Windows. Mixing
-the "bitness" of these programs will lead to errors.
 
 OCRmyPDF will check the Windows Registry and standard locations in your Program Files
 for third party software it needs (specifically, Tesseract and Ghostscript). To
@@ -413,6 +411,10 @@ to change the PATH.
     Please download Python from Python.org or Chocolatey instead, and do not use the
     Microsoft Store version.
 
+.. warning::
+
+    32-bit Windows might work, but is not supported.
+
 Windows Subsystem for Linux
 ---------------------------
 
@@ -636,7 +638,7 @@ system-wide:
 .. code-block:: bash
 
     git clone -b master https://github.com/ocrmypdf/OCRmyPDF.git
-    python3 -m venv
+    python3 -m venv venv
     source venv/bin/activate
     cd OCRmyPDF
     pip install .

docs/introduction.rst

@@ -85,7 +85,7 @@ OCRmyPDF analyzes each page of a PDF to determine the colorspace and
 resolution (DPI) needed to capture all of the information on that page
 without losing content. It uses
 `Ghostscript <http://ghostscript.com/>`__ to rasterize the page, and
-then performs on OCR the rasterized image to create an OCR "layer".
+then performs OCR on the rasterized image to create an OCR "layer".
 The layer is then grafted back onto the original PDF.
 
 While one can use a program like Ghostscript or ImageMagick to get an

docs/release_notes.rst

@@ -28,6 +28,20 @@ tagged yet.
 
 .. |OCRmyPDF PyPI| image:: https://img.shields.io/pypi/v/ocrmypdf.svg
 
+v14.0.2
+=======
+
+-  Fixed :issue:`1052`, an exception on attempting to process certain nonconforming PDFs.
+-  Explicitly documented that Windows 32-bit is no longer supported.
+-  Fixed source installation instructions.
+-  Other documentation fixes.
+
+v14.0.1
+=======
+
+-  Fixed some version checks done with smart version comparison.
+-  Added missing jbig2dec to Docker image.
+
 v14.0.0
 =======
 

misc/watcher.py

@@ -103,6 +103,8 @@ def execute_ocrmypdf(file_path):
         elif ON_SUCCESS_ARCHIVE:
             log.info(f'OCR is done. Archiving {file_path.name} to {ARCHIVE_DIRECTORY}')
             shutil.move(file_path, f'{ARCHIVE_DIRECTORY}/{file_path.name}')
+        else:
+            log.info('OCR is done')
     else:
         log.info('OCR is done')
 

src/ocrmypdf/_exec/ghostscript.py

@@ -14,6 +14,7 @@ from os import fspath
 from pathlib import Path
 from subprocess import PIPE, CalledProcessError
 
+from packaging.version import Version
 from PIL import Image, UnidentifiedImageError
 
 from ocrmypdf.exceptions import SubprocessOutputError
@@ -186,8 +187,8 @@ def generate_pdfa(
         ]
 
     strategy = 'LeaveColorUnchanged'
-    gs_version = version()
+    gs_version = Version(version())
-    if gs_version == '9.56.0':
+    if gs_version == Version('9.56.0'):
         # 9.56.0 breaks our OCR, should be fixed in 9.56.1
         # https://bugs.ghostscript.com/show_bug.cgi?id=705187
         compression_args.append('-dNEWPDF=false')

src/ocrmypdf/pdfinfo/info.py

@@ -477,14 +477,12 @@ def _image_xobjects(container) -> Iterator[tuple[Object, str]]:
     resources = container['/Resources']
     if '/XObject' not in resources:
         return
-    xobjs = resources['/XObject'].as_dict()
+    for key, candidate in resources['/XObject'].items():
-    for xobj in xobjs:
+        if candidate is None or '/Subtype' not in candidate:
-        candidate: Object = xobjs[xobj]
-        if '/Subtype' not in candidate:
             continue
         if candidate['/Subtype'] == '/Image':
             pdfimage = candidate
-            yield (pdfimage, xobj)
+            yield (pdfimage, key)
 
 
 def _find_regular_images(

tests/test_main.py

@@ -15,7 +15,7 @@ import pytest
 from PIL import Image
 
 import ocrmypdf
-from ocrmypdf._exec import ghostscript, tesseract
+from ocrmypdf._exec import tesseract
 from ocrmypdf.exceptions import ExitCode, MissingDependencyError
 from ocrmypdf.pdfa import file_claims_pdfa
 from ocrmypdf.pdfinfo import Colorspace, Encoding, PdfInfo
@@ -178,7 +178,8 @@ def test_maximum_options(renderer, output_type, multipage, outpdf):
 
 
 @pytest.mark.skipif(
-    tesseract.version() >= '5', reason="tess 5 tries harder to find its files"
+    tesseract.TesseractVersion(tesseract.version()) >= tesseract.TesseractVersion('5'),
+    reason="tess 5 tries harder to find its files",
 )
 def test_tesseract_missing_tessdata(monkeypatch, resources, no_outpdf, tmpdir):
     monkeypatch.setenv("TESSDATA_PREFIX", os.fspath(tmpdir))
@@ -777,9 +778,6 @@ def test_sidecar_nonempty(resources, outpdf):
 
 @pytest.mark.parametrize('pdfa_level', ['1', '2', '3'])
 def test_pdfa_n(pdfa_level, resources, outpdf):
-    if pdfa_level == '3' and ghostscript.version() < '9.19':
-        pytest.xfail(reason='Ghostscript >= 9.19 required')
-
     check_ocrmypdf(
         resources / 'ccitt.pdf',
         outpdf,

tests/test_validation.py

@@ -223,6 +223,12 @@ def test_version_comparison():
         need_version='4.1.1',
         version_parser=TesseractVersion,
     )
+    vd.check_external_program(
+        program="gs",
+        package="ghostscript",
+        version_checker=lambda: '10.0',
+        need_version='9.50',
+    )
     with pytest.raises(MissingDependencyError):
         vd.check_external_program(
             program="tesseract",