Add new method QPDFParser::make_description

Avoid creating new identical descriptions for each content stream token.

Add new method QPDFParser::make_description
Avoid creating new identical descriptions for each content stream token.
m-holger
1 parent 71077f11
Showing 2 changed files with 29 additions and 7 deletions
libqpdf/QPDFObjectHandle.cc
libqpdf/qpdf/QPDFParser.hh
@@ -1621,6 +1621,7 @@ QPDFObjectHandle::parseContentStream_data(
     auto input = BufferInputSource(description, stream_data.get());
     Tokenizer tokenizer;
     tokenizer.allowEOF();
+    auto sp_description = QPDFParser::make_description(description, "content");
     bool empty = false;
     while (QIntC::to_size(input.tell()) < stream_length) {
         // Read a token and seek to the beginning. The offset we get from this process is the
@@ -1630,7 +1631,7 @@ QPDFObjectHandle::parseContentStream_data(
         qpdf_offset_t offset = input.getLastOffset();
         input.seek(offset, SEEK_SET);
         auto obj =
-            QPDFParser(input, "content", tokenizer, nullptr, context, false).parse(empty, true);
+            QPDFParser(input, sp_description, "content", tokenizer, context).parse(empty, true);
         if (!obj) {
             // EOF
             break;
@@ -26,9 +26,7 @@ class QPDFParser
         tokenizer(*tokenizer.m),
         decrypter(decrypter),
         context(context),
-        description(
-            std::make_shared<QPDFObject::Description>(
-                std::string(input.getName() + ", " + object_description + " at offset $PO"))),
+        description(make_description(input.getName(), object_description)),
         parse_pdf(parse_pdf)
     {
     }
@@ -45,16 +43,39 @@ class QPDFParser
         tokenizer(tokenizer),
         decrypter(decrypter),
         context(context),
-        description(
-            std::make_shared<QPDFObject::Description>(
-                std::string(input.getName() + ", " + object_description + " at offset $PO"))),
+        description(make_description(input.getName(), object_description)),
         parse_pdf(parse_pdf)
     {
     }
+
+    // Used by parseContentStream_data only
+    QPDFParser(
+        InputSource& input,
+        std::shared_ptr<QPDFObject::Description> sp_description,
+        std::string const& object_description,
+        qpdf::Tokenizer& tokenizer,
+        QPDF* context) :
+        input(input),
+        object_description(object_description),
+        tokenizer(tokenizer),
+        decrypter(nullptr),
+        context(context),
+        description(std::move(sp_description)),
+        parse_pdf(false)
+    {
+    }
     ~QPDFParser() = default;
     QPDFObjectHandle parse(bool& empty, bool content_stream);
+    static std::shared_ptr<QPDFObject::Description>
+    make_description(std::string const& input_name, std::string const& object_description)
+    {
+        using namespace std::literals;
+        return std::make_shared<QPDFObject::Description>(
+            input_name + ", " + object_description + " at offset $PO");
+    }
+
   private:
     // Parser state.  Note:
     // state <= st_dictionary_value == (state = st_dictionary_key || state = st_dictionary_value)