diff options
| -rw-r--r-- | include/qpdf/QPDFObjectHandle.hh | 15 | ||||
| -rw-r--r-- | libqpdf/QPDF.cc | 2 | ||||
| -rw-r--r-- | libqpdf/QPDFObjectHandle.cc | 9 |
3 files changed, 5 insertions, 21 deletions
diff --git a/include/qpdf/QPDFObjectHandle.hh b/include/qpdf/QPDFObjectHandle.hh index 399d1b01..16e8dc8b 100644 --- a/include/qpdf/QPDFObjectHandle.hh +++ b/include/qpdf/QPDFObjectHandle.hh @@ -326,7 +326,7 @@ class QPDFObjectHandle }; QPDF_DLL - QPDFObjectHandle(); + QPDFObjectHandle() = default; QPDF_DLL QPDFObjectHandle(QPDFObjectHandle const&) = default; QPDF_DLL @@ -1453,12 +1453,9 @@ class QPDFObjectHandle private: static QPDFObjectHandle - newIndirect( - QPDF* qpdf, - QPDFObjGen const& og, - std::shared_ptr<QPDFObject> const& obj) + newIndirect(std::shared_ptr<QPDFObject> const& obj) { - return QPDFObjectHandle(qpdf, og, obj); + return QPDFObjectHandle(obj); } static QPDFObjectHandle newStream( @@ -1580,14 +1577,10 @@ class QPDFObjectHandle bool isImage(bool exclude_imagemask = true); private: - QPDFObjectHandle( - QPDF* qpdf, - QPDFObjGen const& og, - std::shared_ptr<QPDFObject> const& obj) : + QPDFObjectHandle(std::shared_ptr<QPDFObject> const& obj) : obj(obj) { } - QPDFObjectHandle(std::shared_ptr<QPDFObject> const&); // Private object factory methods static QPDFObjectHandle newStream( diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc index 1e73f794..e41290f2 100644 --- a/libqpdf/QPDF.cc +++ b/libqpdf/QPDF.cc @@ -2113,7 +2113,7 @@ QPDF::newIndirect(QPDFObjGen const& og, std::shared_ptr<QPDFObject> const& obj) if (!obj->hasDescription()) { obj->setDescription(this, "object " + og.unparse(' ')); } - return QPDFObjectHandle::Factory::newIndirect(this, og, obj); + return QPDFObjectHandle::Factory::newIndirect(obj); } void diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc index 7a614bbf..19a85034 100644 --- a/libqpdf/QPDFObjectHandle.cc +++ b/libqpdf/QPDFObjectHandle.cc @@ -235,15 +235,6 @@ LastChar::getLastChar() return this->last_char; } -QPDFObjectHandle::QPDFObjectHandle() -{ -} - -QPDFObjectHandle::QPDFObjectHandle(std::shared_ptr<QPDFObject> const& data) : - obj(data) -{ -} - void QPDFObjectHandle::releaseResolved() { |