From db87f3ca55f631fa0eccfb0ea11552b07b545790 Mon Sep 17 00:00:00 2001 From: m-holger Date: Fri, 14 Mar 2025 15:27:26 +0000 Subject: [PATCH] Move QPDFObject::getResolvedTypeCode implementation --- libqpdf/qpdf/QPDFObjectHandle_private.hh | 13 +++++++++++++ libqpdf/qpdf/QPDFObject_private.hh | 15 +++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/libqpdf/qpdf/QPDFObjectHandle_private.hh b/libqpdf/qpdf/QPDFObjectHandle_private.hh index 009f43b..2473c2b 100644 --- a/libqpdf/qpdf/QPDFObjectHandle_private.hh +++ b/libqpdf/qpdf/QPDFObjectHandle_private.hh @@ -4,6 +4,7 @@ #include #include +#include #include namespace qpdf @@ -428,6 +429,18 @@ QPDFObject::create(Args&&... args) return std::make_shared(std::forward(T(std::forward(args)...))); } +inline qpdf_object_type_e +QPDFObject::getResolvedTypeCode() const +{ + if (getTypeCode() == ::ot_unresolved) { + return QPDF::Resolver::resolved(qpdf, og)->getTypeCode(); + } + if (getTypeCode() == ::ot_reference) { + return std::get(value).obj->getTypeCode(); + } + return getTypeCode(); +} + inline qpdf::Array QPDFObjectHandle::as_array(qpdf::typed options) const { diff --git a/libqpdf/qpdf/QPDFObject_private.hh b/libqpdf/qpdf/QPDFObject_private.hh index 8a9be46..888f8ca 100644 --- a/libqpdf/qpdf/QPDFObject_private.hh +++ b/libqpdf/qpdf/QPDFObject_private.hh @@ -7,8 +7,8 @@ #include #include #include +#include #include -#include #include #include @@ -301,17 +301,8 @@ class QPDFObject std::string getStringValue() const; // Return a unique type code for the resolved object - qpdf_object_type_e - getResolvedTypeCode() const - { - if (getTypeCode() == ::ot_unresolved) { - return QPDF::Resolver::resolved(qpdf, og)->getTypeCode(); - } - if (getTypeCode() == ::ot_reference) { - return std::get(value).obj->getTypeCode(); - } - return getTypeCode(); - } + inline qpdf_object_type_e getResolvedTypeCode() const; + // Return a unique type code for the object qpdf_object_type_e getTypeCode() const -- libgit2 0.21.4