OpenSystemsDevelopment / qpdf

Commit 92de83977fd2456a759e7beddb522c51d112a940

Authored by m-holger
1 parent 3052c451

Refactor `QPDFObjectHandle::arrayOrStreamToStreamArray`: replace `as_array` and … 

…bounds checks with subscript operator, simplify loop logic, and remove redundant trace.
Inline Side-by-side
Showing 2 changed files with 1 additions and 3 deletions
libqpdf/QPDFObjectHandle.cc
  View file @92de839
@@ -1234,11 +1234,10 @@ QPDFObjectHandle::arrayOrStreamToStreamArray( @@ -1234,11 +1234,10 @@ QPDFObjectHandle::arrayOrStreamToStreamArray(
1234 if (auto array = as_array(strict)) { 1234 if (auto array = as_array(strict)) {
1235 int n_items = static_cast<int>(array.size()); 1235 int n_items = static_cast<int>(array.size());
1236 for (int i = 0; i < n_items; ++i) { 1236 for (int i = 0; i < n_items; ++i) {
1237 - QPDFObjectHandle item = array.at(i).second; 1237 + QPDFObjectHandle item = array[i];
1238 if (item.isStream()) { 1238 if (item.isStream()) {
1239 result.emplace_back(item); 1239 result.emplace_back(item);
1240 } else { 1240 } else {
1241 - QTC::TC("qpdf", "QPDFObjectHandle non-stream in stream array");  
1242 item.warn( 1241 item.warn(
1243 {qpdf_e_damaged_pdf, 1242 {qpdf_e_damaged_pdf,
1244 "", 1243 "",
qpdf/qpdf.testcov
  View file @92de839
@@ -282,7 +282,6 @@ qpdf-c called qpdf_set_newline_before_endstream 0 @@ -282,7 +282,6 @@ qpdf-c called qpdf_set_newline_before_endstream 0
282 SF_FlateLzwDecode TIFF predictor 0 282 SF_FlateLzwDecode TIFF predictor 0
283 QPDFTokenizer inline image at EOF 0 283 QPDFTokenizer inline image at EOF 0
284 Pl_QPDFTokenizer found ID 0 284 Pl_QPDFTokenizer found ID 0
285 -QPDFObjectHandle non-stream in stream array 0  
286 QPDFObjectHandle coalesce called on stream 0 285 QPDFObjectHandle coalesce called on stream 0
287 QPDFObjectHandle coalesce provide stream data 0 286 QPDFObjectHandle coalesce provide stream data 0
288 QPDF_Stream bad token at end during normalize 0 287 QPDF_Stream bad token at end during normalize 0