diff options
| author | m-holger <m-holger@kubitscheck.org> | 2022-08-14 12:19:00 +0200 |
|---|---|---|
| committer | m-holger <m-holger@kubitscheck.org> | 2022-09-01 18:19:31 +0200 |
| commit | 5033e3b215c36457106cc2dd0150f2322655360c (patch) | |
| tree | 5b4043c4d1307e46932d593972762f3510abc2c6 /libqpdf | |
| parent | 4a8515912c80e8d98c3c1a42eec4bdf7b6bbd8e1 (diff) | |
| download | qpdf-5033e3b215c36457106cc2dd0150f2322655360c.tar.zst | |
Add method QPDFObject::getQPDF and remove QPDFObjectHandle::qpdf
Diffstat (limited to 'libqpdf')
| -rw-r--r-- | libqpdf/QPDFObjectHandle.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc index c55506a5..2c93dcbf 100644 --- a/libqpdf/QPDFObjectHandle.cc +++ b/libqpdf/QPDFObjectHandle.cc @@ -235,13 +235,11 @@ LastChar::getLastChar() return this->last_char; } -QPDFObjectHandle::QPDFObjectHandle() : - qpdf(nullptr) +QPDFObjectHandle::QPDFObjectHandle() { } QPDFObjectHandle::QPDFObjectHandle(std::shared_ptr<QPDFObject> const& data) : - qpdf(nullptr), obj(data) { } @@ -2284,7 +2282,6 @@ QPDFObjectHandle::copyObject( " reserved object handle direct"); } - qpdf = nullptr; og = QPDFObjGen(); std::shared_ptr<QPDFObject> new_obj; @@ -2572,8 +2569,9 @@ QPDFObjectHandle::isImage(bool exclude_imagemask) void QPDFObjectHandle::checkOwnership(QPDFObjectHandle const& item) const { - if ((this->qpdf != nullptr) && (item.qpdf != nullptr) && - (this->qpdf != item.qpdf)) { + auto qpdf = getOwningQPDF(); + auto item_qpdf = item.getOwningQPDF(); + if ((qpdf != nullptr) && (item_qpdf != nullptr) && (qpdf != item_qpdf)) { QTC::TC("qpdf", "QPDFObjectHandle check ownership"); throw std::logic_error( "Attempting to add an object from a different QPDF." |