From b9dc1098928e0886f54b09a59eeb7cc9322493e0 Mon Sep 17 00:00:00 2001
From: "James R. Barlow" <jim@purplerock.ca>
Date: Sun, 24 Jun 2018 00:15:41 -0700
Subject: [PATCH] optimize: use new pikepdf api for objgen

---
 setup.py                 | 2 +-
 src/ocrmypdf/optimize.py | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/setup.py b/setup.py
index 09335cc3..5bbb31cc 100644
--- a/setup.py
+++ b/setup.py
@@ -248,7 +248,7 @@ setup(
     install_requires=[
         'cffi >= 1.9.1',          # must be a setup and install requirement
         'img2pdf >= 0.2.4',       # pure Python, so track HEAD closely
-        'pikepdf >= 0.2.0',
+        'pikepdf > 0.2.0',
         'Pillow >= 4.0.0, != 5.1.0 ; sys_platform == "darwin"',
                                   # Pillow < 4 has BytesIO/TIFF bug w/img2pdf 0.2.3
                                   # block 5.1.0, broken wheels
diff --git a/src/ocrmypdf/optimize.py b/src/ocrmypdf/optimize.py
index 64bc3cdc..ae5e5195 100644
--- a/src/ocrmypdf/optimize.py
+++ b/src/ocrmypdf/optimize.py
@@ -141,7 +141,7 @@ def extract_images(pike, root, log, options):
         except AttributeError:
             continue
         for imname, image in dict(xobjs).items():
-            xref = image._objgen[0]
+            xref = image.objgen[0]
             if xref in changed_xrefs:
                 continue  # Don't improve same image twice
             try:
@@ -208,7 +208,7 @@ def convert_to_jbig2(pike, jbig2_groups, root, log, options):
             xref, _ = xref_ext
             jbig2_im_file = root / (prefix + '.{:04d}'.format(n))
             jbig2_im_data = jbig2_im_file.read_bytes()
-            im_obj = pike._get_object_id(xref, 0)
+            im_obj = pike.get_object(xref, 0)
             im_obj.write(
                 jbig2_im_data, pikepdf.Name('/JBIG2Decode'),
                 pikepdf.Dictionary({
@@ -236,7 +236,7 @@ def transcode_jpegs(pike, jpegs, root, log, options):
             continue
 
         compdata = leptonica.CompressedData.open(opt_jpg)
-        im_obj = pike._get_object_id(xref, 0)
+        im_obj = pike.get_object(xref, 0)
         im_obj.write(
             compdata.read(), pikepdf.Name('/DCTDecode'),
             pikepdf.Null()
@@ -254,7 +254,7 @@ def transcode_pngs(pike, pngs, root, log, options):
                     PNG_QUALITY[0], PNG_QUALITY[1])
 
     for xref in pngs:
-        im_obj = pike._get_object_id(xref, 0)
+        im_obj = pike.get_object(xref, 0)
 
         # Open, transcode (!), package for PDF
         try: