From 5033e3b215c36457106cc2dd0150f2322655360c Mon Sep 17 00:00:00 2001
From: m-holger <m-holger@kubitscheck.org>
Date: Sun, 14 Aug 2022 11:19:00 +0100
Subject: Add method QPDFObject::getQPDF and remove QPDFObjectHandle::qpdf

---
 libqpdf/QPDFObjectHandle.cc | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'libqpdf')

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."
-- 
cgit v1.2.3-54-g00ecf