OpenSystemsDevelopment / qpdf

Commit 5f541754bb28db46875f7e0ea5b3f9b7aa53748f

Authored by m-holger
Committed by GitHub
2 parents db985e28 947e7753

Merge pull request #1386 from m-holger/objgen 

Use BaseHandle::operator QPDFObjGen in examples
Inline Side-by-side
Showing 3 changed files with 7 additions and 8 deletions
examples/pdf-bookmarks.cc
  View file @5f54175
@@ -50,7 +50,7 @@ generate_page_map(QPDF& qpdf) @@ -50,7 +50,7 @@ generate_page_map(QPDF& qpdf)
50 QPDFPageDocumentHelper dh(qpdf); 50 QPDFPageDocumentHelper dh(qpdf);
51 int n = 0; 51 int n = 0;
52 for (auto const& page: dh.getAllPages()) { 52 for (auto const& page: dh.getAllPages()) {
53 - page_map[page.getObjectHandle().getObjGen()] = ++n; 53 + page_map[page] = ++n;
54 } 54 }
55 } 55 }
56 56
@@ -104,15 +104,14 @@ show_bookmark_details(QPDFOutlineObjectHelper outline, std::vector<int> numbers) @@ -104,15 +104,14 @@ show_bookmark_details(QPDFOutlineObjectHelper outline, std::vector<int> numbers)
104 QPDFObjectHandle dest_page = outline.getDestPage(); 104 QPDFObjectHandle dest_page = outline.getDestPage();
105 if (!dest_page.isNull()) { 105 if (!dest_page.isNull()) {
106 QTC::TC("examples", "pdf-bookmarks dest"); 106 QTC::TC("examples", "pdf-bookmarks dest");
107 - QPDFObjGen og = dest_page.getObjGen();  
108 - if (page_map.count(og)) {  
109 - target = std::to_string(page_map[og]); 107 + if (page_map.count(dest_page)) {
  108 + target = std::to_string(page_map[dest_page]);
110 } 109 }
111 } 110 }
112 std::cout << "[ -> " << target << " ] "; 111 std::cout << "[ -> " << target << " ] ";
113 } 112 }
114 113
115 - std::cout << outline.getTitle() << std::endl; 114 + std::cout << outline.getTitle() << '\n';
116 } 115 }
117 116
118 void 117 void
examples/pdf-invert-images.cc
  View file @5f54175
@@ -48,7 +48,7 @@ ImageInverter::registerImage( @@ -48,7 +48,7 @@ ImageInverter::registerImage(
48 // class from ever being deleted since the reference count will never drop to zero (and 48 // class from ever being deleted since the reference count will never drop to zero (and
49 // std::shared_ptr doesn't have weak references). 49 // std::shared_ptr doesn't have weak references).
50 50
51 - QPDFObjGen og(image.getObjGen()); 51 + QPDFObjGen og(image);
52 // Store information about the images based on the object and generation number. Recall that a 52 // Store information about the images based on the object and generation number. Recall that a
53 // single image object may be used more than once, so no need to update the same stream multiple 53 // single image object may be used more than once, so no need to update the same stream multiple
54 // times. 54 // times.
fuzz/qpdf_pages_fuzzer.cc
  View file @5f54175
@@ -84,13 +84,13 @@ FuzzHelper::testPages() @@ -84,13 +84,13 @@ FuzzHelper::testPages()
84 pldh.getLabelForPage(pageno); 84 pldh.getLabelForPage(pageno);
85 QPDFObjectHandle page_obj(page.getObjectHandle()); 85 QPDFObjectHandle page_obj(page.getObjectHandle());
86 page_obj.getJSON(JSON::LATEST, true).unparse(); 86 page_obj.getJSON(JSON::LATEST, true).unparse();
87 - odh.getOutlinesForPage(page_obj.getObjGen()); 87 + odh.getOutlinesForPage(page_obj);
88 88
89 for (auto& aoh: afdh.getWidgetAnnotationsForPage(page)) { 89 for (auto& aoh: afdh.getWidgetAnnotationsForPage(page)) {
90 afdh.getFieldForAnnotation(aoh); 90 afdh.getFieldForAnnotation(aoh);
91 } 91 }
92 } catch (QPDFExc& e) { 92 } catch (QPDFExc& e) {
93 - std::cerr << "page " << pageno << ": " << e.what() << std::endl; 93 + std::cerr << "page " << pageno << ": " << e.what() << '\n';
94 } 94 }
95 } 95 }
96 } 96 }