From 407b0766b882de046b224bef717200ec6a6be8a1 Mon Sep 17 00:00:00 2001 From: m-holger Date: Mon, 1 Aug 2022 15:08:48 +0100 Subject: [PATCH] Inline QPDFObjectHandle::getObjGen etc Also, make QPDFObjectHandle::isIndirect const. --- include/qpdf/QPDFObjectHandle.hh | 40 ++++++++++++++++++++++++++++---- libqpdf/QPDFObjectHandle.cc | 30 ------------------------ 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/include/qpdf/QPDFObjectHandle.hh b/include/qpdf/QPDFObjectHandle.hh index 7ea6b062..5d9f52d5 100644 --- a/include/qpdf/QPDFObjectHandle.hh +++ b/include/qpdf/QPDFObjectHandle.hh @@ -319,7 +319,7 @@ class QPDFObjectHandle QPDF_DLL QPDFObjectHandle& operator=(QPDFObjectHandle const&) = default; QPDF_DLL - bool isInitialized() const; + inline bool isInitialized() const; // Return type code and type name of underlying object. These are // useful for doing rapid type tests (like switch statements) or @@ -367,7 +367,7 @@ class QPDFObjectHandle // This returns true in addition to the query for the specific // type for indirect objects. QPDF_DLL - bool isIndirect(); + inline bool isIndirect() const; // True for everything except array, dictionary, stream, word, and // inline image. @@ -1300,11 +1300,11 @@ class QPDFObjectHandle // QPDFObjGen instead. QPDF_DLL - QPDFObjGen getObjGen() const; + inline QPDFObjGen getObjGen() const; QPDF_DLL - int getObjectID() const; + inline int getObjectID() const; QPDF_DLL - int getGeneration() const; + inline int getGeneration() const; QPDF_DLL std::string unparse(); @@ -1846,4 +1846,34 @@ class QPDFObjectHandle::QPDFArrayItems QPDFObjectHandle oh; }; +inline QPDFObjGen +QPDFObjectHandle::getObjGen() const +{ + return og; +} + +inline int +QPDFObjectHandle::getObjectID() const +{ + return og.getObj(); +} + +inline int +QPDFObjectHandle::getGeneration() const +{ + return og.getGen(); +} + +inline bool +QPDFObjectHandle::isIndirect() const +{ + return initialized && (getObjectID() != 0); +} + +inline bool +QPDFObjectHandle::isInitialized() const +{ + return initialized; +} + #endif // QPDFOBJECTHANDLE_HH diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc index 135b7c39..1a615ef3 100644 --- a/libqpdf/QPDFObjectHandle.cc +++ b/libqpdf/QPDFObjectHandle.cc @@ -286,12 +286,6 @@ QPDFObjectHandle::setObjectDescriptionFromInput( QUtil::int_to_string(offset))); } -bool -QPDFObjectHandle::isInitialized() const -{ - return this->initialized; -} - QPDFObject::object_type_e QPDFObjectHandle::getTypeCode() { @@ -434,12 +428,6 @@ QPDFObjectHandle::isReserved() return dereference() && this->reserved; } -bool -QPDFObjectHandle::isIndirect() -{ - return this->initialized && (getObjectID() != 0); -} - bool QPDFObjectHandle::isScalar() { @@ -1499,24 +1487,6 @@ QPDFObjectHandle::replaceStreamData( sdp, filter, decode_parms); } -QPDFObjGen -QPDFObjectHandle::getObjGen() const -{ - return og; -} - -int -QPDFObjectHandle::getObjectID() const -{ - return og.getObj(); -} - -int -QPDFObjectHandle::getGeneration() const -{ - return og.getGen(); -} - std::map QPDFObjectHandle::getPageImages() {