OpenSystemsDevelopment / qpdf

Commit 9a95497e7e13c84512b4bcf0d7d0ca9d342a2479

Authored by m-holger
1 parent 8191d4cd

Refactor `QPDFEFStreamObjectHelper`: simplify parameter fetching, replace redund… 

…ant logic, and streamline type conversions.
Inline Side-by-side
Showing 1 changed file with 9 additions and 11 deletions
libqpdf/QPDFEFStreamObjectHelper.cc
  View file @9a95497
@@ -58,9 +58,9 @@ QPDFEFStreamObjectHelper::getModDate() @@ -58,9 +58,9 @@ QPDFEFStreamObjectHelper::getModDate()
58 size_t 58 size_t
59 QPDFEFStreamObjectHelper::getSize() 59 QPDFEFStreamObjectHelper::getSize()
60 { 60 {
61 - auto val = getParam("/Size");  
62 - if (val.isInteger()) {  
63 - return QIntC::to_size(val.getUIntValueAsUInt()); 61 + if (Integer Size = getParam("/Size")) {
  62 + size_t result = Size;
  63 + return result;
64 } 64 }
65 return 0; 65 return 0;
66 } 66 }
@@ -68,14 +68,12 @@ QPDFEFStreamObjectHelper::getSize() @@ -68,14 +68,12 @@ QPDFEFStreamObjectHelper::getSize()
68 std::string 68 std::string
69 QPDFEFStreamObjectHelper::getSubtype() 69 QPDFEFStreamObjectHelper::getSubtype()
70 { 70 {
71 - auto val = oh().getDict().getKey("/Subtype");  
72 - if (val.isName()) {  
73 - auto n = val.getName();  
74 - if (n.length() > 1) {  
75 - return n.substr(1); 71 + if (Name Subtype = oh().getDict()["/Subtype"]) {
  72 + if (Subtype.value().size() > 1) {
  73 + return Subtype.value().substr(1);
76 } 74 }
77 } 75 }
78 - return ""; 76 + return {};
79 } 77 }
80 78
81 std::string 79 std::string
@@ -110,14 +108,14 @@ QPDFEFStreamObjectHelper::createEFStream(QPDF& qpdf, std::function<void(Pipeline @@ -110,14 +108,14 @@ QPDFEFStreamObjectHelper::createEFStream(QPDF& qpdf, std::function<void(Pipeline
110 QPDFEFStreamObjectHelper& 108 QPDFEFStreamObjectHelper&
111 QPDFEFStreamObjectHelper::setCreationDate(std::string const& date) 109 QPDFEFStreamObjectHelper::setCreationDate(std::string const& date)
112 { 110 {
113 - setParam("/CreationDate", QPDFObjectHandle::newString(date)); 111 + setParam("/CreationDate", String(date));
114 return *this; 112 return *this;
115 } 113 }
116 114
117 QPDFEFStreamObjectHelper& 115 QPDFEFStreamObjectHelper&
118 QPDFEFStreamObjectHelper::setModDate(std::string const& date) 116 QPDFEFStreamObjectHelper::setModDate(std::string const& date)
119 { 117 {
120 - setParam("/ModDate", QPDFObjectHandle::newString(date)); 118 + setParam("/ModDate", String(date));
121 return *this; 119 return *this;
122 } 120 }
123 121