From 29f5830325f810612b8c683282133c47f5da0b33 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Mon, 4 Mar 2013 10:59:20 -0500
Subject: 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.
---
 libqpdf/QPDFObjectHandle.cc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'libqpdf')

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
-- 
cgit v1.2.3-54-g00ecf