Update branch with v6.1.4

src/ocrmypdf/exec/__init__.py

@@ -24,6 +24,7 @@ from subprocess import run, STDOUT, PIPE, CalledProcessError
 from ..exceptions import MissingDependencyError
 
 
+
 def get_version(program, *, 
         version_arg='--version', regex=r'(\d+(\.\d+)*)'):
     "Get the version of the specified program"
@@ -37,6 +38,10 @@ def get_version(program, *,
             stdout=PIPE, stderr=STDOUT, check=True)
         output = proc.stdout
     except CalledProcessError as e:
+        if e.returncode < 0:
+            raise MissingDependencyError(
+                "Ran program '{}' but it exited with an error:\n{}".format(
+                    program, e.output)) from e
         raise MissingDependencyError(
             "Could not find program '{}' on the PATH".format(
                 program)) from e

src/ocrmypdf/exec/ghostscript.py

@@ -127,6 +127,11 @@ def generate_pdfa(pdf_pages, output_file, compression, log,
             "-dAutoFilterGrayImages=true",
         ]
 
+    # Older versions of Ghostscript expect a leading slash in 
+    # sColorConversionStrategy, newer ones should not have it. See Ghostscript 
+    # git commit fe1c025d.
+    strategy = 'RGB' if version() >= '9.19' else '/RGB'
+
     with NamedTemporaryFile(delete=True) as gs_pdf:
         args_gs = [
             "gs",
@@ -137,7 +142,7 @@ def generate_pdfa(pdf_pages, output_file, compression, log,
             "-dNumRenderingThreads=" + str(threads),
             "-sDEVICE=pdfwrite",
             "-dAutoRotatePages=/None",
-            "-sColorConversionStrategy=/RGB",
+            "-sColorConversionStrategy=" + strategy,
             "-sProcessColorModel=DeviceRGB"
         ] + compression_args + [
             "-dJPEGQ=95",

src/ocrmypdf/exec/unpaper.py

@@ -57,15 +57,15 @@ def run(input_file, output_file, dpi, log, mode_args):
             else:
                 im = im.convert(mode='RGB')
         except IOError as e:
-            log.error(
-                    "Could not convert image with type " + im.mode)
+            log.error("Could not convert image with type " + im.mode)
+            im.close()
             raise MissingDependencyError() from e
 
     try:
         suffix = SUFFIXES[im.mode]
     except KeyError:
-        log.error(
-                "Failed to convert image to a supported format.")
+        log.error("Failed to convert image to a supported format.")
+        im.close()
         raise MissingDependencyError() from e
 
     with NamedTemporaryFile(suffix=suffix) as input_pnm, \
@@ -90,20 +90,9 @@ def run(input_file, output_file, dpi, log, mode_args):
             Image.open(output_pnm.name).save(output_file, dpi=(dpi, dpi))
 
 
-def deskew(input_file, output_file, dpi, log):
-    run(input_file, output_file, dpi, log, [
-        '--mask-scan-size', '100',  # don't blank out narrow columns
-        '--no-border-align',  # don't align visible content to borders
-        '--no-mask-center',   # don't center visible content within page
-        '--no-grayfilter',    # don't remove light gray areas
-        '--no-blackfilter',   # don't remove solid black areas
-        '--no-noisefilter',   # don't remove salt and pepper noise
-        '--no-blurfilter'     # don't remove blurry objects/debris
-    ])
-
-
 def clean(input_file, output_file, dpi, log):
     run(input_file, output_file, dpi, log, [
+        '--layout', 'none',
         '--mask-scan-size', '100',  # don't blank out narrow columns
         '--no-border-align',  # don't align visible content to borders
         '--no-mask-center',   # don't center visible content within page