OpenSystemsDevelopment / qpdf

Commit ea5164938e77cb968003fe06f98b87f648319bbf

Authored by m-holger
1 parent 9e30de80

Remove temporary OHArray

Inline Side-by-side
Showing 5 changed files with 29 additions and 62 deletions
libqpdf/CMakeLists.txt
  View file @ea51649
... ... @@ -116,7 +116,6 @@ set(libqpdf_SOURCES
116 116 SecureRandomDataProvider.cc
117 117 SF_FlateLzwDecode.cc
118 118 SparseOHArray.cc
119   - OHArray.cc
120 119 qpdf-c.cc
121 120 qpdfjob-c.cc
122 121 qpdflogger-c.cc)
... ...
libqpdf/OHArray.cc deleted
View file @9e30de8
1   -#include <qpdf/OHArray.hh>
2   -
3   -OHArray::OHArray()
4   -{
5   -}
libqpdf/QPDF_Array.cc
  View file @ea51649
... ... @@ -29,7 +29,7 @@ QPDF_Array::QPDF_Array(SparseOHArray const&amp; items) :
29 29 {
30 30 }
31 31  
32   -QPDF_Array::QPDF_Array(OHArray const& items) :
  32 +QPDF_Array::QPDF_Array(std::vector<std::shared_ptr<QPDFObject>> const& items) :
33 33 QPDFValue(::ot_array, "array"),
34 34 sparse(false),
35 35 elements(items)
... ... @@ -56,7 +56,7 @@ QPDF_Array::create(SparseOHArray const&amp; items)
56 56 }
57 57  
58 58 std::shared_ptr<QPDFObject>
59   -QPDF_Array::create(OHArray const& items)
  59 +QPDF_Array::create(std::vector<std::shared_ptr<QPDFObject>> const& items)
60 60 {
61 61 return do_create(new QPDF_Array(items));
62 62 }
... ... @@ -70,10 +70,10 @@ QPDF_Array::copy(bool shallow)
70 70 if (shallow) {
71 71 return create(elements);
72 72 } else {
73   - OHArray result;
74   - result.elements.reserve(elements.elements.size());
75   - for (auto const& element: elements.elements) {
76   - result.elements.push_back(
  73 + std::vector<std::shared_ptr<QPDFObject>> result;
  74 + result.reserve(elements.size());
  75 + for (auto const& element: elements) {
  76 + result.push_back(
77 77 element
78 78 ? (element->getObjGen().isIndirect() ? element
79 79 : element->copy())
... ... @@ -90,7 +90,7 @@ QPDF_Array::disconnect()
90 90 if (sparse) {
91 91 sp_elements.disconnect();
92 92 } else {
93   - for (auto const& iter: elements.elements) {
  93 + for (auto const& iter: elements) {
94 94 if (iter) {
95 95 QPDFObjectHandle::DisconnectAccess::disconnect(iter);
96 96 }
... ... @@ -112,7 +112,7 @@ QPDF_Array::unparse()
112 112 return result;
113 113 } else {
114 114 std::string result = "[ ";
115   - auto size = elements.elements.size();
  115 + auto size = elements.size();
116 116 for (int i = 0; i < int(size); ++i) {
117 117 result += getItem(i).unparse();
118 118 result += " ";
... ... @@ -134,7 +134,7 @@ QPDF_Array::getJSON(int json_version)
134 134 return j;
135 135 } else {
136 136 JSON j = JSON::makeArray();
137   - size_t size = elements.elements.size();
  137 + size_t size = elements.size();
138 138 for (int i = 0; i < int(size); ++i) {
139 139 j.addArrayElement(getItem(i).getJSON(json_version));
140 140 }
... ... @@ -150,7 +150,7 @@ QPDF_Array::getNItems() const
150 150 // a lot of code.
151 151 return QIntC::to_int(sp_elements.size());
152 152 } else {
153   - return QIntC::to_int(elements.elements.size());
  153 + return QIntC::to_int(elements.size());
154 154 }
155 155 }
156 156  
... ... @@ -164,11 +164,11 @@ QPDF_Array::getItem(int n) const
164 164 }
165 165 return sp_elements.at(QIntC::to_size(n));
166 166 } else {
167   - if ((n < 0) || (n >= QIntC::to_int(elements.elements.size()))) {
  167 + if ((n < 0) || (n >= QIntC::to_int(elements.size()))) {
168 168 throw std::logic_error(
169 169 "INTERNAL ERROR: bounds error accessing QPDF_Array element");
170 170 }
171   - auto const& obj = elements.elements.at(size_t(n));
  171 + auto const& obj = elements.at(size_t(n));
172 172 return obj ? obj : null_oh;
173 173 }
174 174 }
... ... @@ -182,8 +182,7 @@ QPDF_Array::getAsVector(std::vector&lt;QPDFObjectHandle&gt;&amp; v) const
182 182 v.push_back(sp_elements.at(i));
183 183 }
184 184 } else {
185   - v = std::vector<QPDFObjectHandle>(
186   - elements.elements.cbegin(), elements.elements.cend());
  185 + v = std::vector<QPDFObjectHandle>(elements.cbegin(), elements.cend());
187 186 }
188 187 }
189 188  
... ... @@ -194,10 +193,10 @@ QPDF_Array::setItem(int n, QPDFObjectHandle const&amp; oh)
194 193 sp_elements.setAt(QIntC::to_size(n), oh);
195 194 } else {
196 195 size_t idx = size_t(n);
197   - if (n < 0 || idx >= elements.elements.size()) {
  196 + if (n < 0 || idx >= elements.size()) {
198 197 throw std::logic_error("bounds error setting item in QPDF_Array");
199 198 }
200   - elements.elements[idx] = oh.getObj();
  199 + elements[idx] = oh.getObj();
201 200 }
202 201 }
203 202  
... ... @@ -210,9 +209,9 @@ QPDF_Array::setFromVector(std::vector&lt;QPDFObjectHandle&gt; const&amp; v)
210 209 sp_elements.append(iter);
211 210 }
212 211 } else {
213   - elements = OHArray();
  212 + elements.resize(0);
214 213 for (auto const& iter: v) {
215   - elements.elements.push_back(iter.getObj());
  214 + elements.push_back(iter.getObj());
216 215 }
217 216 }
218 217 }
... ... @@ -231,10 +230,7 @@ QPDF_Array::setFromVector(std::vector&lt;std::shared_ptr&lt;QPDFObject&gt;&gt;&amp;&amp; v)
231 230 }
232 231 }
233 232 } else {
234   - elements = OHArray();
235   - for (auto&& item: v) {
236   - elements.elements.push_back(std::move(item));
237   - }
  233 + elements = std::move(v);
238 234 }
239 235 }
240 236  
... ... @@ -251,17 +247,16 @@ QPDF_Array::insertItem(int at, QPDFObjectHandle const&amp; item)
251 247 } else {
252 248 // As special case, also allow insert beyond the end
253 249 size_t idx = QIntC::to_size(at);
254   - if ((at < 0) || (at > QIntC::to_int(elements.elements.size()))) {
  250 + if ((at < 0) || (at > QIntC::to_int(elements.size()))) {
255 251 throw std::logic_error(
256 252 "INTERNAL ERROR: bounds error accessing QPDF_Array element");
257 253 }
258   - if (idx == elements.elements.size()) {
  254 + if (idx == elements.size()) {
259 255 // Allow inserting to the last position
260   - elements.elements.push_back(item.getObj());
  256 + elements.push_back(item.getObj());
261 257 } else {
262 258 int n = int(idx);
263   - elements.elements.insert(
264   - elements.elements.cbegin() + n, item.getObj());
  259 + elements.insert(elements.cbegin() + n, item.getObj());
265 260 }
266 261 }
267 262 }
... ... @@ -272,7 +267,7 @@ QPDF_Array::appendItem(QPDFObjectHandle const&amp; item)
272 267 if (sparse) {
273 268 sp_elements.append(item);
274 269 } else {
275   - elements.elements.push_back(item.getObj());
  270 + elements.push_back(item.getObj());
276 271 }
277 272 }
278 273  
... ... @@ -283,10 +278,10 @@ QPDF_Array::eraseItem(int at)
283 278 sp_elements.erase(QIntC::to_size(at));
284 279 } else {
285 280 size_t idx = QIntC::to_size(at);
286   - if (idx >= elements.elements.size()) {
  281 + if (idx >= elements.size()) {
287 282 throw std::logic_error("bounds error erasing item from OHArray");
288 283 }
289 284 int n = int(idx);
290   - elements.elements.erase(elements.elements.cbegin() + n);
  285 + elements.erase(elements.cbegin() + n);
291 286 }
292 287 }
... ...
libqpdf/qpdf/OHArray.hh deleted
View file @9e30de8
1   -#ifndef QPDF_OHARRAY_HH
2   -#define QPDF_OHARRAY_HH
3   -
4   -#include <qpdf/QPDFObjectHandle.hh>
5   -#include <qpdf/QPDFObject_private.hh>
6   -
7   -#include <vector>
8   -
9   -class QPDF_Array;
10   -
11   -class OHArray
12   -{
13   - public:
14   - OHArray();
15   -
16   - private:
17   - friend class QPDF_Array;
18   - std::vector<std::shared_ptr<QPDFObject>> elements;
19   -};
20   -
21   -#endif // QPDF_OHARRAY_HH
libqpdf/qpdf/QPDF_Array.hh
  View file @ea51649
... ... @@ -3,9 +3,7 @@
3 3  
4 4 #include <qpdf/QPDFValue.hh>
5 5  
6   -#include <qpdf/OHArray.hh>
7 6 #include <qpdf/SparseOHArray.hh>
8   -#include <list>
9 7 #include <vector>
10 8  
11 9 class QPDF_Array: public QPDFValue
... ... @@ -17,7 +15,8 @@ class QPDF_Array: public QPDFValue
17 15 static std::shared_ptr<QPDFObject>
18 16 create(std::vector<std::shared_ptr<QPDFObject>>&& items, bool sparse);
19 17 static std::shared_ptr<QPDFObject> create(SparseOHArray const& items);
20   - static std::shared_ptr<QPDFObject> create(OHArray const& items);
  18 + static std::shared_ptr<QPDFObject>
  19 + create(std::vector<std::shared_ptr<QPDFObject>> const& items);
21 20 virtual std::shared_ptr<QPDFObject> copy(bool shallow = false);
22 21 virtual std::string unparse();
23 22 virtual JSON getJSON(int json_version);
... ... @@ -38,10 +37,10 @@ class QPDF_Array: public QPDFValue
38 37 QPDF_Array(std::vector<QPDFObjectHandle> const& items);
39 38 QPDF_Array(std::vector<std::shared_ptr<QPDFObject>>&& items, bool sparse);
40 39 QPDF_Array(SparseOHArray const& items);
41   - QPDF_Array(OHArray const& items);
  40 + QPDF_Array(std::vector<std::shared_ptr<QPDFObject>> const& items);
42 41 bool sparse{false};
43 42 SparseOHArray sp_elements;
44   - OHArray elements;
  43 + std::vector<std::shared_ptr<QPDFObject>> elements;
45 44 };
46 45  
47 46 #endif // QPDF_ARRAY_HH
... ...