OpenSystemsDevelopment / qpdf

Commit 07bb5c3dd6213af9c9a64e17ae2d457cf4fc7190

Authored by m-holger
1 parent 1496472e

Overload QPDF_Null::create to take a child object description

Inline Side-by-side
Showing 4 changed files with 39 additions and 15 deletions
libqpdf/QPDFObjectHandle.cc
  View file @07bb5c3
... ... @@ -802,12 +802,10 @@ QPDFObjectHandle::getArrayNItems()
802 802 QPDFObjectHandle
803 803 QPDFObjectHandle::getArrayItem(int n)
804 804 {
805   - QPDFObjectHandle result;
806 805 auto array = asArray();
807 806 if (array && (n < array->getNItems()) && (n >= 0)) {
808   - result = array->getItem(n);
  807 + return array->getItem(n);
809 808 } else {
810   - result = newNull();
811 809 if (array) {
812 810 objectWarning("returning null for out of bounds array access");
813 811 QTC::TC("qpdf", "QPDFObjectHandle array bounds");
... ... @@ -817,9 +815,8 @@ QPDFObjectHandle::getArrayItem(int n)
817 815 }
818 816 static auto constexpr msg =
819 817 " -> null returned from invalid array access"sv;
820   - result.obj->setChildDescription(obj, msg, "");
  818 + return QPDF_Null::create(obj, msg, "");
821 819 }
822   - return result;
823 820 }
824 821  
825 822 bool
... ... @@ -1028,19 +1025,15 @@ QPDFObjectHandle::hasKey(std::string const&amp; key)
1028 1025 QPDFObjectHandle
1029 1026 QPDFObjectHandle::getKey(std::string const& key)
1030 1027 {
1031   - QPDFObjectHandle result;
1032   - auto dict = asDictionary();
1033   - if (dict) {
1034   - result = dict->getKey(key);
  1028 + if (auto dict = asDictionary()) {
  1029 + return dict->getKey(key);
1035 1030 } else {
1036 1031 typeWarning("dictionary", "returning null for attempted key retrieval");
1037 1032 QTC::TC("qpdf", "QPDFObjectHandle dictionary null for getKey");
1038   - result = newNull();
1039 1033 static auto constexpr msg =
1040 1034 " -> null returned from getting key $VD from non-Dictionary"sv;
1041   - result.obj->setChildDescription(obj, msg, key);
  1035 + return QPDF_Null::create(obj, msg, "");
1042 1036 }
1043   - return result;
1044 1037 }
1045 1038  
1046 1039 QPDFObjectHandle
... ...
libqpdf/QPDF_Dictionary.cc
  View file @07bb5c3
... ... @@ -2,6 +2,7 @@
2 2  
3 3 #include <qpdf/QPDFObject_private.hh>
4 4 #include <qpdf/QPDF_Name.hh>
  5 +#include <qpdf/QPDF_Null.hh>
5 6  
6 7 using namespace std::literals;
7 8  
... ... @@ -100,10 +101,8 @@ QPDF_Dictionary::getKey(std::string const&amp; key)
100 101 // May be a null object
101 102 return item->second;
102 103 } else {
103   - auto null = QPDFObjectHandle::newNull();
104 104 static auto constexpr msg = " -> dictionary key $VD"sv;
105   - null.getObj()->setChildDescription(shared_from_this(), msg, key);
106   - return null;
  105 + return QPDF_Null::create(shared_from_this(), msg, key);
107 106 }
108 107 }
109 108  
... ...
libqpdf/QPDF_Null.cc
  View file @07bb5c3
1 1 #include <qpdf/QPDF_Null.hh>
2 2  
  3 +#include <qpdf/QPDFObject_private.hh>
  4 +
3 5 QPDF_Null::QPDF_Null() :
4 6 QPDFValue(::ot_null, "null")
5 7 {
... ... @@ -12,6 +14,28 @@ QPDF_Null::create()
12 14 }
13 15  
14 16 std::shared_ptr<QPDFObject>
  17 +QPDF_Null::create(
  18 + std::shared_ptr<QPDFObject> parent,
  19 + std::string_view const& static_descr,
  20 + std::string var_descr)
  21 +{
  22 + auto n = do_create(new QPDF_Null());
  23 + n->setChildDescription(parent, static_descr, var_descr);
  24 + return n;
  25 +}
  26 +
  27 +std::shared_ptr<QPDFObject>
  28 +QPDF_Null::create(
  29 + std::shared_ptr<QPDFValue> parent,
  30 + std::string_view const& static_descr,
  31 + std::string var_descr)
  32 +{
  33 + auto n = do_create(new QPDF_Null());
  34 + n->setChildDescription(parent, static_descr, var_descr);
  35 + return n;
  36 +}
  37 +
  38 +std::shared_ptr<QPDFObject>
15 39 QPDF_Null::copy(bool shallow)
16 40 {
17 41 return create();
... ...
libqpdf/qpdf/QPDF_Null.hh
  View file @07bb5c3
... ... @@ -8,6 +8,14 @@ class QPDF_Null: public QPDFValue
8 8 public:
9 9 virtual ~QPDF_Null() = default;
10 10 static std::shared_ptr<QPDFObject> create();
  11 + static std::shared_ptr<QPDFObject> create(
  12 + std::shared_ptr<QPDFObject> parent,
  13 + std::string_view const& static_descr,
  14 + std::string var_descr);
  15 + static std::shared_ptr<QPDFObject> create(
  16 + std::shared_ptr<QPDFValue> parent,
  17 + std::string_view const& static_descr,
  18 + std::string var_descr);
11 19 virtual std::shared_ptr<QPDFObject> copy(bool shallow = false);
12 20 virtual std::string unparse();
13 21 virtual JSON getJSON(int json_version);
... ...