From 6e891f91d38fdb1b97e013bf221b18b7d5c42b04 Mon Sep 17 00:00:00 2001
From: "James R. Barlow" <jim@purplerock.ca>
Date: Mon, 29 May 2017 11:09:46 -0700
Subject: [PATCH] ghostscript, qpdf: Restore API backward compatibility

---
 ocrmypdf/exec/ghostscript.py | 8 ++++----
 ocrmypdf/exec/qpdf.py        | 8 ++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ocrmypdf/exec/ghostscript.py b/ocrmypdf/exec/ghostscript.py
index db36a092..f3d58999 100644
--- a/ocrmypdf/exec/ghostscript.py
+++ b/ocrmypdf/exec/ghostscript.py
@@ -86,8 +86,8 @@ def rasterize_pdf(input_file, output_file, xres, yres, raster_device, log,
             raise SubprocessOutputError()
 
 
-def generate_pdfa(*, pdf_version, pdf_pages, output_file, compression, log,
-                  threads=1):
+def generate_pdfa(pdf_pages, output_file, compression, log,
+                  threads=1, pdf_version='1.5'):
     compression_args = []
     if compression == 'jpeg':
         compression_args = [
@@ -115,8 +115,8 @@ def generate_pdfa(*, pdf_version, pdf_pages, output_file, compression, log,
             "-dQUIET",
             "-dBATCH",
             "-dNOPAUSE",
-            '-dCompatibilityLevel=' + str(pdf_version),
-            '-dNumRenderingThreads=' + str(threads),
+            "-dCompatibilityLevel=" + str(pdf_version),
+            "-dNumRenderingThreads=" + str(threads),
             "-sDEVICE=pdfwrite",
             "-dAutoRotatePages=/None",
             "-sColorConversionStrategy=/RGB",
diff --git a/ocrmypdf/exec/qpdf.py b/ocrmypdf/exec/qpdf.py
index 47f94882..2ba8a5b6 100644
--- a/ocrmypdf/exec/qpdf.py
+++ b/ocrmypdf/exec/qpdf.py
@@ -120,13 +120,17 @@ def split_pages(input_file, work_folder, npages):
         run(args_qpdf, check=True)
 
 
-def merge(*, min_version, input_files, output_file):
+def merge(input_files, output_file, min_version=None):
     """Merge the list of input files (all filenames) into the output file.
 
     The input files may contain one or more pages.
     """
+    version_arg = ['--min-version={}'.format(min_version)] \
+                  if min_version else []
+
     args_qpdf = [
-        get_program('qpdf'), '--min-version={}'.format(min_version),
+        get_program('qpdf')
+    ] + version_arg + [
         input_files[0], '--pages'
     ] + input_files + ['--', output_file]
     run(args_qpdf, check=True)