v10.3.3 release notes

Fixes #607

debian/copyright

@@ -43,7 +43,7 @@ Copyright: (C) 2014 Armin Ronacher
  (C) 2017 James R. Barlow
 License: BSD-3-clause
 
-Files: tests/spoof/*
+Files: tests/plugins/*
 Copyright: (C) 2016, 2017, 2016-2018 James R. Barlow
 License: Expat
 

docs/api.rst

@@ -51,6 +51,10 @@ Forking a child process to call ``ocrmypdf.ocr()`` is suggested. That
 way your application will survive and remain interactive even if
 OCRmyPDF does not.
 
+Programs that call ``ocrmypdf.ocr()`` should also install a SIGBUS signal
+handler (except on Windows), to raise an exception if access to a memory
+mapped file fails. OCRmyPDF may use memory mapping.
+
 .. warning::
 
     On Windows, the script that calls ``ocrmypdf.ocr()`` must be protected

docs/release_notes.rst

@@ -16,6 +16,25 @@ Note that it is licensed under GPLv3, so scripts that
 ``import ocrmypdf`` and are released publicly should probably also be
 licensed under GPLv3.
 
+v10.3.3
+=======
+
+-  Fixed a "KeyError: 'dpi'" error message when using ``--threshold`` on an image.
+   (#607)
+
+v10.3.2
+=======
+
+-  Fixed a case where we reported "no reason" for a file size increase, when we
+   could determine the reason.
+-  Enabled support for pdfminer.six 20200726.
+
+v10.3.1
+=======
+
+-  Fixed a number of test suite failures with pdfminer.six older than veresion 20200420.
+-  Enabled support for pdfminer.six 20200720.
+
 v10.3.0
 =======
 

setup.py

@@ -83,7 +83,7 @@ setup(
         'cffi >= 1.9.1',  # must be a setup and install requirement
         'coloredlogs >= 14.0',  # strictly optional
         'img2pdf >= 0.3.0, < 0.4',  # pure Python, so track HEAD closely
-        'pdfminer.six >= 20191110, <= 20200517',
+        'pdfminer.six >= 20191110, <= 20200726',
         'pikepdf >= 1.14.0, < 2',
         'Pillow >= 7.0.0',
         'pluggy >= 0.13.0',

src/ocrmypdf/_pipeline.py

@@ -530,7 +530,9 @@ def create_ocr_image(image: Path, page_context: PageContext):
         if options.threshold:
             pix = leptonica.Pix.frompil(im)
             pix = pix.masked_threshold_on_background_norm()
-            im = pix.topil()
+            im_pix = pix.topil()
+            im_pix.info['dpi'] = im.info['dpi']
+            im = im_pix
 
         del draw
 

src/ocrmypdf/_validation.py

@@ -416,6 +416,10 @@ def report_output_file_size(options, input_file, output_file):
                     f"The optional dependency '{name}' was not found, so some image "
                     f"optimizations could not be attempted."
                 )
+    if options.output_type.startswith('pdfa'):
+        reasons.append("PDF/A conversion was enabled. (Try `--output-type pdf`.)")
+    if options.plugins:
+        reasons.append("Plugins were used.")
 
     if reasons:
         explanation = "Possible reasons for this include:\n" + '\n'.join(reasons) + "\n"

src/ocrmypdf/pdfinfo/layout.py

@@ -220,8 +220,16 @@ class TextPositionTracker(PDFLayoutAnalyzer):
 
 def get_page_analysis(infile, pageno, pscript5_mode):
     rman = pdfminer.pdfinterp.PDFResourceManager(caching=True)
+    if pdfminer.__version__ < '20200402':
+        # Workaround for https://github.com/pdfminer/pdfminer.six/issues/395
+        disable_boxes_flow = 2
+    else:
+        disable_boxes_flow = None
     dev = TextPositionTracker(
-        rman, laparams=LAParams(all_texts=True, detect_vertical=True, boxes_flow=None)
+        rman,
+        laparams=LAParams(
+            all_texts=True, detect_vertical=True, boxes_flow=disable_boxes_flow
+        ),
     )
     interp = pdfminer.pdfinterp.PDFPageInterpreter(rman, dev)
 

tests/spoof/gs.py

@@ -1,40 +0,0 @@
-# © 2019 James R. Barlow: github.com/jbarlow83
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-"""Find Ghostscript executable"""
-
-
-import os
-import shutil
-
-
-def real_ghostscript(argv):
-    if os.name != 'nt':
-        gs = shutil.which('gs')
-        gs_args = [gs] + argv[1:]
-        os.execv(gs_args[0], gs_args)
-    else:
-        gs = shutil.which('gswin64c')
-        if not gs:
-            gs = shutil.which('gswin32c')
-        os.execv(gs, argv[1:])
-
-    return  # Not reachable

tests/test_main.py

@@ -877,3 +877,17 @@ def test_image_dpi_not_image(caplog, resources, outpdf):
         'tests/plugins/tesseract_noop.py',
     )
     assert '--image-dpi is being ignored' in caplog.text
+
+
+def test_image_dpi_threshold(resources, outpdf):
+    check_ocrmypdf(
+        resources / 'typewriter.png',
+        outpdf,
+        '--threshold',
+        '--image-dpi=170',
+        '--output-type=pdf',
+        '--optimize=0',
+        '--plugin',
+        'tests/plugins/tesseract_noop.py',
+    )
+    assert outpdf.exists()

tests/test_validation.py

@@ -21,7 +21,7 @@ from unittest.mock import patch
 import pikepdf
 import pytest
 
-import ocrmypdf._validation as vd
+from ocrmypdf import _validation as vd
 from ocrmypdf._plugin_manager import get_plugin_manager
 from ocrmypdf.api import create_options
 from ocrmypdf.cli import get_parser
@@ -141,7 +141,7 @@ def test_report_file_size(tmp_path, caplog):
     pdf = pikepdf.new()
     pdf.save(in_)
     pdf.save(out)
-    opts = make_opts()
+    opts = make_opts(output_type='pdf')
     vd.report_output_file_size(opts, in_, out)
     assert caplog.text == ''
     caplog.clear()
@@ -166,7 +166,7 @@ def test_report_file_size(tmp_path, caplog):
         assert 'optional dependency' in caplog.text
     caplog.clear()
 
-    opts = make_opts(in_, out, optimize=0)
+    opts = make_opts(in_, out, optimize=0, output_type='pdf')
     vd.report_output_file_size(opts, in_, out)
     assert 'disabled' in caplog.text
     caplog.clear()