From 6d62662e2d04ce9134a432d49accb2dcac6b79fa Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Thu, 1 Sep 2022 17:51:10 -0400 Subject: Make QPDFObject::releaseResolved public Now that QPDFObject.hh is out of the public API, we don't really need QPDFObjAccessor. Also, the function didn't have to be virtual anymore. --- libqpdf/QPDFObjectHandle.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libqpdf/QPDFObjectHandle.cc') diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc index a1019955..83369b54 100644 --- a/libqpdf/QPDFObjectHandle.cc +++ b/libqpdf/QPDFObjectHandle.cc @@ -243,12 +243,12 @@ QPDFObjectHandle::releaseResolved() // Do not cross over indirect object boundaries to avoid an // infinite loop. This method may only be called during final // destruction. See comments in QPDF::~QPDF(). - if (isIndirect()) { - if (this->obj.get()) { + if (this->obj.get()) { + if (isIndirect()) { this->obj = nullptr; + } else { + this->obj->releaseResolved(); } - } else { - QPDFObject::ObjAccessor::releaseResolved(this->obj.get()); } } -- cgit v1.2.3-70-g09d2