From bf347dfb739f7012b570681d1260c9f6c0acc48b Mon Sep 17 00:00:00 2001
From: m-holger <m-holger@kubitscheck.org>
Date: Tue, 27 Sep 2022 11:42:47 +0100
Subject: Remove QPDFObjectHandle::Factory::newStream

---
 libqpdf/QPDF.cc             | 10 ++++++----
 libqpdf/QPDFObjectHandle.cc | 16 ----------------
 2 files changed, 6 insertions(+), 20 deletions(-)

(limited to 'libqpdf')

diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index 7b30b90c..a821e4bf 100644
--- a/libqpdf/QPDF.cc
+++ b/libqpdf/QPDF.cc
@@ -1534,8 +1534,10 @@ QPDF::readObject(
                     throw e;
                 }
             }
-            object = QPDFObjectHandle::Factory::newStream(
-                this, og, object, stream_offset, length);
+            auto stream =
+                QPDF_Stream::create(this, og, object, stream_offset, length);
+            stream->setParsedOffset(stream_offset);
+            object = newIndirect(og, stream);
         } else {
             input->seek(cur_offset, SEEK_SET);
         }
@@ -2040,8 +2042,8 @@ QPDF::reserveObjectIfNotExists(QPDFObjGen const& og)
 QPDFObjectHandle
 QPDF::reserveStream(QPDFObjGen const& og)
 {
-    return QPDFObjectHandle::Factory::newStream(
-        this, og, QPDFObjectHandle::newDictionary(), 0, 0);
+    return QPDFObjectHandle::Factory::newIndirect(
+        QPDF_Stream::create(this, og, QPDFObjectHandle::newDictionary(), 0, 0));
 }
 
 QPDFObjectHandle
diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc
index 931960ed..d70267cd 100644
--- a/libqpdf/QPDFObjectHandle.cc
+++ b/libqpdf/QPDFObjectHandle.cc
@@ -2141,22 +2141,6 @@ QPDFObjectHandle::newDictionary(
     return QPDFObjectHandle(QPDF_Dictionary::create(items));
 }
 
-QPDFObjectHandle
-QPDFObjectHandle::newStream(
-    QPDF* qpdf,
-    QPDFObjGen const& og,
-    QPDFObjectHandle stream_dict,
-    qpdf_offset_t offset,
-    size_t length)
-{
-    QPDFObjectHandle result = QPDFObjectHandle(
-        QPDF_Stream::create(qpdf, og, stream_dict, offset, length));
-    if (offset) {
-        result.setParsedOffset(offset);
-    }
-    return result;
-}
-
 QPDFObjectHandle
 QPDFObjectHandle::newStream(QPDF* qpdf)
 {
-- 
cgit v1.2.3-54-g00ecf