OpenSystemsDevelopment / qpdf

Commit db87f3ca55f631fa0eccfb0ea11552b07b545790

Authored by m-holger
1 parent e93f7ff5

Move QPDFObject::getResolvedTypeCode implementation 

... to QPDFObjectHandle_private.hh
Inline Side-by-side
Showing 2 changed files with 16 additions and 12 deletions
libqpdf/qpdf/QPDFObjectHandle_private.hh
  View file @db87f3c
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 #include <qpdf/QPDFObjectHandle.hh> 4 #include <qpdf/QPDFObjectHandle.hh>
5 5
6 #include <qpdf/QPDFObject_private.hh> 6 #include <qpdf/QPDFObject_private.hh>
  7 +#include <qpdf/QPDF_private.hh>
7 #include <qpdf/QUtil.hh> 8 #include <qpdf/QUtil.hh>
8 9
9 namespace qpdf 10 namespace qpdf
@@ -428,6 +429,18 @@ QPDFObject::create(Args&amp;&amp;... args) @@ -428,6 +429,18 @@ QPDFObject::create(Args&amp;&amp;... args)
428 return std::make_shared<QPDFObject>(std::forward<T>(T(std::forward<Args>(args)...))); 429 return std::make_shared<QPDFObject>(std::forward<T>(T(std::forward<Args>(args)...)));
429 } 430 }
430 431
  432 +inline qpdf_object_type_e
  433 +QPDFObject::getResolvedTypeCode() const
  434 +{
  435 + if (getTypeCode() == ::ot_unresolved) {
  436 + return QPDF::Resolver::resolved(qpdf, og)->getTypeCode();
  437 + }
  438 + if (getTypeCode() == ::ot_reference) {
  439 + return std::get<QPDF_Reference>(value).obj->getTypeCode();
  440 + }
  441 + return getTypeCode();
  442 +}
  443 +
431 inline qpdf::Array 444 inline qpdf::Array
432 QPDFObjectHandle::as_array(qpdf::typed options) const 445 QPDFObjectHandle::as_array(qpdf::typed options) const
433 { 446 {
libqpdf/qpdf/QPDFObject_private.hh
  View file @db87f3c
@@ -7,8 +7,8 @@ @@ -7,8 +7,8 @@
7 #include <qpdf/Constants.h> 7 #include <qpdf/Constants.h>
8 #include <qpdf/JSON.hh> 8 #include <qpdf/JSON.hh>
9 #include <qpdf/JSON_writer.hh> 9 #include <qpdf/JSON_writer.hh>
  10 +#include <qpdf/QPDF.hh>
10 #include <qpdf/QPDFObjGen.hh> 11 #include <qpdf/QPDFObjGen.hh>
11 -#include <qpdf/QPDF_private.hh>  
12 #include <qpdf/Types.h> 12 #include <qpdf/Types.h>
13 13
14 #include <map> 14 #include <map>
@@ -301,17 +301,8 @@ class QPDFObject @@ -301,17 +301,8 @@ class QPDFObject
301 std::string getStringValue() const; 301 std::string getStringValue() const;
302 302
303 // Return a unique type code for the resolved object 303 // Return a unique type code for the resolved object
304 - qpdf_object_type_e  
305 - getResolvedTypeCode() const  
306 - {  
307 - if (getTypeCode() == ::ot_unresolved) {  
308 - return QPDF::Resolver::resolved(qpdf, og)->getTypeCode();  
309 - }  
310 - if (getTypeCode() == ::ot_reference) {  
311 - return std::get<QPDF_Reference>(value).obj->getTypeCode();  
312 - }  
313 - return getTypeCode();  
314 - } 304 + inline qpdf_object_type_e getResolvedTypeCode() const;
  305 +
315 // Return a unique type code for the object 306 // Return a unique type code for the object
316 qpdf_object_type_e 307 qpdf_object_type_e
317 getTypeCode() const 308 getTypeCode() const