2
1
mirror of https://github.com/qpdf/qpdf.git synced 2024-11-02 03:42:30 +00:00

Merge pull request #738 from m-holger/inline

Inline QPDFObjectHandle::getObjGen etc
This commit is contained in:
Jay Berkenbilt 2022-08-06 14:19:23 -04:00 committed by GitHub
commit 8095006668
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 35 deletions

View File

@ -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

View File

@ -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<std::string, QPDFObjectHandle>
QPDFObjectHandle::getPageImages()
{