diff options
| author | m-holger <m-holger@kubitscheck.org> | 2022-09-27 12:42:47 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <jberkenbilt@users.noreply.github.com> | 2022-11-19 20:10:42 +0100 |
| commit | bf347dfb739f7012b570681d1260c9f6c0acc48b (patch) | |
| tree | b36d0248a832a2c4cd9db1b9cdca2c8398d2dbcc | |
| parent | 743a735ee008a4bd70cfac97634f350d9a2d46f1 (diff) | |
| download | qpdf-bf347dfb739f7012b570681d1260c9f6c0acc48b.tar.zst | |
Remove QPDFObjectHandle::Factory::newStream
| -rw-r--r-- | include/qpdf/QPDFObjectHandle.hh | 19 | ||||
| -rw-r--r-- | libqpdf/QPDF.cc | 10 | ||||
| -rw-r--r-- | libqpdf/QPDFObjectHandle.cc | 16 |
3 files changed, 6 insertions, 39 deletions
diff --git a/include/qpdf/QPDFObjectHandle.hh b/include/qpdf/QPDFObjectHandle.hh index 42488f95..3610422e 100644 --- a/include/qpdf/QPDFObjectHandle.hh +++ b/include/qpdf/QPDFObjectHandle.hh @@ -1496,17 +1496,6 @@ class QPDFObjectHandle { return QPDFObjectHandle(obj); } - static QPDFObjectHandle - newStream( - QPDF* qpdf, - QPDFObjGen const& og, - QPDFObjectHandle stream_dict, - qpdf_offset_t offset, - size_t length) - { - return QPDFObjectHandle::newStream( - qpdf, og, stream_dict, offset, length); - } }; friend class Factory; @@ -1621,14 +1610,6 @@ class QPDFObjectHandle { } - // Private object factory methods - static QPDFObjectHandle newStream( - QPDF* qpdf, - QPDFObjGen const& og, - QPDFObjectHandle stream_dict, - qpdf_offset_t offset, - size_t length); - QPDF_Array* asArray(); QPDF_Bool* asBool(); QPDF_Dictionary* asDictionary(); 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 @@ -2142,22 +2142,6 @@ QPDFObjectHandle::newDictionary( } 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) { if (qpdf == nullptr) { |