From 947e77530c250ab816193ba74a06ecf41a872a2d Mon Sep 17 00:00:00 2001 From: m-holger Date: Sat, 8 Mar 2025 14:01:46 +0000 Subject: [PATCH] Use BaseHandle::operator QPDFObjGen in examples --- examples/pdf-bookmarks.cc | 9 ++++----- examples/pdf-invert-images.cc | 2 +- fuzz/qpdf_pages_fuzzer.cc | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/examples/pdf-bookmarks.cc b/examples/pdf-bookmarks.cc index 9581a13..87a3b9d 100644 --- a/examples/pdf-bookmarks.cc +++ b/examples/pdf-bookmarks.cc @@ -50,7 +50,7 @@ generate_page_map(QPDF& qpdf) QPDFPageDocumentHelper dh(qpdf); int n = 0; for (auto const& page: dh.getAllPages()) { - page_map[page.getObjectHandle().getObjGen()] = ++n; + page_map[page] = ++n; } } @@ -104,15 +104,14 @@ show_bookmark_details(QPDFOutlineObjectHelper outline, std::vector numbers) QPDFObjectHandle dest_page = outline.getDestPage(); if (!dest_page.isNull()) { QTC::TC("examples", "pdf-bookmarks dest"); - QPDFObjGen og = dest_page.getObjGen(); - if (page_map.count(og)) { - target = std::to_string(page_map[og]); + if (page_map.count(dest_page)) { + target = std::to_string(page_map[dest_page]); } } std::cout << "[ -> " << target << " ] "; } - std::cout << outline.getTitle() << std::endl; + std::cout << outline.getTitle() << '\n'; } void diff --git a/examples/pdf-invert-images.cc b/examples/pdf-invert-images.cc index d303798..09e115d 100644 --- a/examples/pdf-invert-images.cc +++ b/examples/pdf-invert-images.cc @@ -48,7 +48,7 @@ ImageInverter::registerImage( // class from ever being deleted since the reference count will never drop to zero (and // std::shared_ptr doesn't have weak references). - QPDFObjGen og(image.getObjGen()); + QPDFObjGen og(image); // Store information about the images based on the object and generation number. Recall that a // single image object may be used more than once, so no need to update the same stream multiple // times. diff --git a/fuzz/qpdf_pages_fuzzer.cc b/fuzz/qpdf_pages_fuzzer.cc index f1a0db1..66c8439 100644 --- a/fuzz/qpdf_pages_fuzzer.cc +++ b/fuzz/qpdf_pages_fuzzer.cc @@ -84,13 +84,13 @@ FuzzHelper::testPages() pldh.getLabelForPage(pageno); QPDFObjectHandle page_obj(page.getObjectHandle()); page_obj.getJSON(JSON::LATEST, true).unparse(); - odh.getOutlinesForPage(page_obj.getObjGen()); + odh.getOutlinesForPage(page_obj); for (auto& aoh: afdh.getWidgetAnnotationsForPage(page)) { afdh.getFieldForAnnotation(aoh); } } catch (QPDFExc& e) { - std::cerr << "page " << pageno << ": " << e.what() << std::endl; + std::cerr << "page " << pageno << ": " << e.what() << '\n'; } } } -- libgit2 0.21.4