From 45e9257d6edd2b1be2d8d4b8fc54e376ab3b8998 Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Tue, 28 Mar 2017 11:02:46 -0700 Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20use=20filename=20=E2=80=9Cpdfa?= =?UTF-8?q?=5Fdef.ps=E2=80=9D=20for=20GS=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit At recommendation of Artifex people, don’t use the filename pdfa_def.ps because if given without a full path Ghostscript will prioritize searching its own resources over the current directory, and will pick up the example file pdfa_def.ps instead. We used the full path anyway, but this is a prudent defensive change to avoid odd Ghostscript behavior. --- ocrmypdf/pdfa.py | 2 +- ocrmypdf/pipeline.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ocrmypdf/pdfa.py b/ocrmypdf/pdfa.py index bb4b5c91..09b25cab 100644 --- a/ocrmypdf/pdfa.py +++ b/ocrmypdf/pdfa.py @@ -102,7 +102,7 @@ def _get_pdfa_def(icc_profile, icc_identifier, pdfmark): return result -def generate_pdfa_def(target_filename, pdfmark, icc='sRGB'): +def generate_pdfa_ps(target_filename, pdfmark, icc='sRGB'): if icc == 'sRGB': icc_profile = SRGB_ICC_PROFILE else: diff --git a/ocrmypdf/pipeline.py b/ocrmypdf/pipeline.py index a6ff6f14..08a688a8 100644 --- a/ocrmypdf/pipeline.py +++ b/ocrmypdf/pipeline.py @@ -23,7 +23,7 @@ from ruffus import formatter, regex, Pipeline, suffix from .hocrtransform import HocrTransform from .pageinfo import pdf_get_all_pageinfo -from .pdfa import generate_pdfa_def, file_claims_pdfa +from .pdfa import generate_pdfa_ps, file_claims_pdfa from .helpers import re_symlink, is_iterable_notstr, page_number from .exec import ghostscript, tesseract, qpdf from .exceptions import * @@ -767,7 +767,7 @@ def generate_postscript_stub( options = context.get_options() pdf = pypdf.PdfFileReader(input_file) pdfmark = get_pdfmark(pdf, options) - generate_pdfa_def(output_file, pdfmark) + generate_pdfa_ps(output_file, pdfmark) def skip_page( @@ -1036,7 +1036,7 @@ def build_pipeline(options, work_folder, log, context): task_func=generate_postscript_stub, input=task_repair_pdf, filter=formatter(r'\.repaired\.pdf'), - output=os.path.join(work_folder, 'pdfa_def.ps'), + output=os.path.join(work_folder, 'pdfa.ps'), extras=[log, context]) task_generate_postscript_stub.active_if(options.output_type == 'pdfa')