Merge pull request #929 from m-holger/ogguard

Add new convenience class QPDFObjGen::Guard

1 files changed, 2 insertions, 17 deletions

diff --git a/libqpdf/QPDFOutlineDocumentHelper.cc b/libqpdf/QPDFOutlineDocumentHelper.cc
index 5b2f71f6..e3485bfd 100644
--- a/libqpdf/QPDFOutlineDocumentHelper.cc
+++ b/libqpdf/QPDFOutlineDocumentHelper.cc
@@ -15,13 +15,8 @@ QPDFOutlineDocumentHelper::QPDFOutlineDocumentHelper(QPDF& qpdf) :
         return;
     }
     QPDFObjectHandle cur = outlines.getKey("/First");
-    std::set<QPDFObjGen> seen;
-    while (!cur.isNull()) {
-        auto og = cur.getObjGen();
-        if (seen.count(og)) {
-            break;
-        }
-        seen.insert(og);
+    QPDFObjGen::set seen;
+    while (!cur.isNull() && seen.add(cur)) {
         this->m->outlines.push_back(
             QPDFOutlineObjectHelper::Accessor::create(cur, *this, 1));
         cur = cur.getKey("/Next");
@@ -104,13 +99,3 @@ QPDFOutlineDocumentHelper::resolveNamedDest(QPDFObjectHandle name)
     }
     return result;
 }
-
-bool
-QPDFOutlineDocumentHelper::checkSeen(QPDFObjGen const& og)
-{
-    if (this->m->seen.count(og) > 0) {
-        return true;
-    }
-    this->m->seen.insert(og);
-    return false;
-}