From 95b2830d1780df2bff1366cdce84fe0f55079c51 Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Fri, 13 Jul 2018 23:50:35 -0700 Subject: [PATCH] Support removal of Null from pikepdf --- src/ocrmypdf/optimize.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ocrmypdf/optimize.py b/src/ocrmypdf/optimize.py index d4f33520..973b90b8 100644 --- a/src/ocrmypdf/optimize.py +++ b/src/ocrmypdf/optimize.py @@ -24,6 +24,11 @@ import sys from PIL import Image import pikepdf +try: + from pikepdf import Null # pikepdf <= 0.2.2 +except ImportError: + def Null(): # pikepdf > 0.2.2 + return None from ._jobcontext import JobContext from . import leptonica @@ -241,7 +246,7 @@ def transcode_jpegs(pike, jpegs, root, log, options): im_obj = pike.get_object(xref, 0) im_obj.write( compdata.read(), pikepdf.Name('/DCTDecode'), - pikepdf.Null() + Null() ) @@ -281,7 +286,7 @@ def transcode_pngs(pike, pngs, root, log, options): if len(compdata) > int(im_obj.stream_dict.Length): continue # If we produced a larger image, don't use - predictor = pikepdf.Null() + predictor = Null() if compdata.predictor > 0: predictor = pikepdf.Dictionary({'/Predictor': compdata.predictor})