OpenSystemsDevelopment / qpdf

Commit 13d55d88cd62e416433c2402f1ba4061d67dcd28

Authored by m-holger
1 parent e78c1201

Refactor `NNTreeIterator::getNextKid`: simplify loop logic, replace `getArrayNIt… 

…ems` and `getArrayItem` with `size` and subscript operators, and improve code readability.
Inline Side-by-side
Showing 2 changed files with 6 additions and 13 deletions
libqpdf/NNTree.cc
  View file @13d55d8
... ... @@ -87,28 +87,22 @@ NNTreeIterator::PathElement::PathElement(QPDFObjectHandle const& node, int kid_n
87 87 QPDFObjectHandle
88 88 NNTreeIterator::getNextKid(PathElement& pe, bool backward)
89 89 {
90   - QPDFObjectHandle result;
91   - bool found = false;
92   - while (!found) {
  90 + while (true) {
93 91 pe.kid_number += backward ? -1 : 1;
94 92 auto kids = pe.node.getKey("/Kids");
95   - if ((pe.kid_number >= 0) && (pe.kid_number < kids.getArrayNItems())) {
96   - result = kids.getArrayItem(pe.kid_number);
  93 + if (pe.kid_number >= 0 && std::cmp_less(pe.kid_number, kids.size())) {
  94 + auto result = kids[pe.kid_number];
97 95 if (result.isDictionary() &&
98 96 (result.hasKey("/Kids") || result.hasKey(impl.details.itemsKey()))) {
99   - found = true;
  97 + return result;
100 98 } else {
101   - QTC::TC("qpdf", "NNTree skip invalid kid");
102 99 impl.warn(
103   - pe.node,
104   - ("skipping over invalid kid at index " + std::to_string(pe.kid_number)));
  100 + pe.node, "skipping over invalid kid at index " + std::to_string(pe.kid_number));
105 101 }
106 102 } else {
107   - result = QPDFObjectHandle::newNull();
108   - found = true;
  103 + return QPDFObjectHandle::newNull();
109 104 }
110 105 }
111   - return result;
112 106 }
113 107  
114 108 bool
... ...
qpdf/qpdf.testcov
  View file @13d55d8
... ... @@ -519,7 +519,6 @@ qpdf-c called qpdf_oh_unparse_resolved 0
519 519 qpdf-c called qpdf_oh_unparse_binary 0
520 520 QPDFWriter getFilterOnWrite false 0
521 521 QPDFPageObjectHelper::forEachXObject 3
522   -NNTree skip invalid kid 0
523 522 NNTree repair 0
524 523 NNTree insertAfter inserts first 0
525 524 NNTree erased last kid/item in tree 1
... ...