diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2013-03-04 16:59:20 +0100 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2013-03-05 19:35:46 +0100 |
| commit | 29f5830325f810612b8c683282133c47f5da0b33 (patch) | |
| tree | f454aad34dbfcd42dfcb14222ca7493a564c58cd /libqpdf | |
| parent | 119f2a4b684aae7cec8841412a5fc89bcbae404d (diff) | |
| download | qpdf-29f5830325f810612b8c683282133c47f5da0b33.tar.zst | |
Fix getTypeCode and getTypeName work for indirect objects
Remove const qualifier from getTypeCode and get getTypeName methods of
QPDFObjectHandle, make them work properly for indirect objects, and
exercise them much better in the test suite.
Diffstat (limited to 'libqpdf')
| -rw-r--r-- | libqpdf/QPDFObjectHandle.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc index 0c6b0a9d..84db6003 100644 --- a/libqpdf/QPDFObjectHandle.cc +++ b/libqpdf/QPDFObjectHandle.cc @@ -87,10 +87,11 @@ QPDFObjectHandle::isInitialized() const } QPDFObject::object_type_e -QPDFObjectHandle::getTypeCode() const +QPDFObjectHandle::getTypeCode() { - if (obj.getPointer()) + if (this->initialized) { + dereference(); return obj->getTypeCode(); } else @@ -100,10 +101,11 @@ QPDFObjectHandle::getTypeCode() const } char const* -QPDFObjectHandle::getTypeName() const +QPDFObjectHandle::getTypeName() { - if (obj.getPointer()) + if (this->initialized) { + dereference(); return obj->getTypeName(); } else |