Refactor `QPDFObjectHandle` and related classes to replace `Buffer` usage with `…

…std::string_view`, improving performance and code clarity.

Refactor `QPDFObjectHandle` and related classes to replace `Buffer` usage with `…
…std::string_view`, improving performance and code clarity.
m-holger
1 parent 31073ea3
Showing 8 changed files with 22 additions and 28 deletions
include/qpdf/QPDF.hh
include/qpdf/QPDFObjectHandle.hh
libqpdf/JSON.cc
libqpdf/Pl_QPDFTokenizer.cc
libqpdf/QPDF.cc
libqpdf/QPDFObjectHandle.cc
libqpdf/QPDFParser.cc
libqpdf/QPDF_objects.cc
@@ -95,7 +95,8 @@ class QPDF
  
     // Parse a PDF file loaded into a memory buffer.  This works exactly like processFile except
     // that the PDF file is in memory instead of on disk.  The description appears in any warning or
-    // error message in place of the file name.
+    // error message in place of the file name. The buffer is owned by the caller and must remain
+    // valid for the lifetime of the QPDF object.
     QPDF_DLL
     void processMemoryFile(
         char const* description, char const* buf, size_t length, char const* password = nullptr);
@@ -1351,7 +1351,7 @@ class QPDFObjectHandle: public qpdf::BaseHandle
     void setParsedOffset(qpdf_offset_t offset);
     void parseContentStream_internal(std::string const& description, ParserCallbacks* callbacks);
     static void parseContentStream_data(
-        std::shared_ptr<Buffer>,
+        std::string_view stream_data,
         std::string const& description,
         ParserCallbacks* callbacks,
         QPDF* context);
@@ -2,7 +2,7 @@
  
 #include <qpdf/JSON_writer.hh>
  
-#include <qpdf/BufferInputSource.hh>
+#include <qpdf/InputSource_private.hh>
 #include <qpdf/Pl_Base64.hh>
 #include <qpdf/Pl_Concatenate.hh>
 #include <qpdf/Pl_String.hh>
@@ -1348,7 +1348,7 @@ JSON::parse(InputSource&amp; is, Reactor* reactor)
 JSON
 JSON::parse(std::string const& s)
 {
-    BufferInputSource bis("json input", s);
+    is::OffsetBuffer bis("json input", s);
     JSONParser jp(bis, nullptr);
     return jp.parse();
 }
 #include <qpdf/Pl_QPDFTokenizer.hh>
  
-#include <qpdf/BufferInputSource.hh>
+#include <qpdf/InputSource_private.hh>
+#include <qpdf/Pipeline_private.hh>
 #include <qpdf/QTC.hh>
+
 #include <stdexcept>
  
+using namespace qpdf;
+
 class Pl_QPDFTokenizer::Members
 {
   public:
@@ -13,7 +17,8 @@ class Pl_QPDFTokenizer::Members
  
     QPDFObjectHandle::TokenFilter* filter{nullptr};
     QPDFTokenizer tokenizer;
-    Pl_Buffer buf{"tokenizer buffer"};
+    std::string buffer;
+    pl::String buf{"pl_tokenizer", nullptr, buffer};
 };
  
 Pl_QPDFTokenizer::Pl_QPDFTokenizer(
@@ -39,8 +44,7 @@ Pl_QPDFTokenizer::write(unsigned char const* data, size_t len)
 void
 Pl_QPDFTokenizer::finish()
 {
-    m->buf.finish();
-    auto input = BufferInputSource("tokenizer data", m->buf.getBuffer(), true);
+    auto input = is::OffsetBuffer("tokenizer data", m->buffer);
     std::string empty;
     while (true) {
         auto token = m->tokenizer.readToken(input, empty, true);
@@ -11,7 +11,6 @@
 #include <sstream>
 #include <vector>
  
-#include <qpdf/BufferInputSource.hh>
 #include <qpdf/FileInputSource.hh>
 #include <qpdf/InputSource_private.hh>
 #include <qpdf/OffsetInputSource.hh>
@@ -259,12 +258,8 @@ void
 QPDF::processMemoryFile(
     char const* description, char const* buf, size_t length, char const* password)
 {
-    processInputSource(
-        std::shared_ptr<InputSource>(
-            // line-break
-            new BufferInputSource(
-                description, new Buffer(QUtil::unsigned_char_pointer(buf), length), true)),
-        password);
+    auto is = std::make_shared<is::OffsetBuffer>(description, std::string_view{buf, length});
+    processInputSource(is, password);
 }
  
 void
@@ -2,7 +2,6 @@
  
 #include <qpdf/QPDFObjectHandle_private.hh>
  
-#include <qpdf/BufferInputSource.hh>
 #include <qpdf/JSON_writer.hh>
 #include <qpdf/Pipeline_private.hh>
 #include <qpdf/Pl_Buffer.hh>
@@ -1452,10 +1451,7 @@ QPDFObjectHandle
 QPDFObjectHandle::parse(
     QPDF* context, std::string const& object_str, std::string const& object_description)
 {
-    // BufferInputSource does not modify the input, but Buffer either requires a string& or copies
-    // the string.
-    Buffer buf(const_cast<std::string&>(object_str));
-    auto input = BufferInputSource("parsed object", &buf);
+    auto input = is::OffsetBuffer("parsed object", object_str);
     auto result = QPDFParser::parse(input, object_description, context);
     size_t offset = QIntC::to_size(input.tell());
     while (offset < object_str.length()) {
@@ -1549,11 +1545,11 @@ void
 QPDFObjectHandle::parseContentStream_internal(
     std::string const& description, ParserCallbacks* callbacks)
 {
-    Pl_Buffer buf("concatenated stream data buffer");
+    std::string stream_data;
+    pl::String buf(stream_data);
     std::string all_description;
     pipeContentStreams(&buf, description, all_description);
-    auto stream_data = buf.getBufferSharedPointer();
-    callbacks->contentSize(stream_data->getSize());
+    callbacks->contentSize(stream_data.size());
     try {
         parseContentStream_data(stream_data, all_description, callbacks, getOwningQPDF());
     } catch (TerminateParsing&) {
@@ -1564,13 +1560,13 @@ QPDFObjectHandle::parseContentStream_internal(
  
 void
 QPDFObjectHandle::parseContentStream_data(
-    std::shared_ptr<Buffer> stream_data,
+    std::string_view stream_data,
     std::string const& description,
     ParserCallbacks* callbacks,
     QPDF* context)
 {
-    size_t stream_length = stream_data->getSize();
-    auto input = BufferInputSource(description, stream_data.get());
+    size_t stream_length = stream_data.size();
+    auto input = is::OffsetBuffer(description, stream_data);
     Tokenizer tokenizer;
     tokenizer.allowEOF();
     auto sp_description = QPDFParser::make_description(description, "content");
 #include <qpdf/QPDFParser.hh>
  
-#include <qpdf/BufferInputSource.hh>
 #include <qpdf/QPDF.hh>
 #include <qpdf/QPDFObjGen.hh>
 #include <qpdf/QPDFObjectHandle.hh>
@@ -12,7 +12,6 @@
 #include <vector>
  
 #include <qpdf/BufferInputSource.hh>
-#include <qpdf/FileInputSource.hh>
 #include <qpdf/InputSource_private.hh>
 #include <qpdf/OffsetInputSource.hh>
 #include <qpdf/Pipeline.hh>