Commit b19e06fd8bc1d4fe032c4ad344bb60edb16867ae

Authored by m-holger
Committed by Jay Berkenbilt
1 parent 83910224

Change QPDFParser::setDescription to take a shared_ptr<QPDFObject> parameter

libqpdf/QPDFParser.cc
@@ -381,7 +381,7 @@ QPDFParser::parse(bool&amp; empty, bool content_stream) @@ -381,7 +381,7 @@ QPDFParser::parse(bool&amp; empty, bool content_stream)
381 "dictionary ended prematurely; " 381 "dictionary ended prematurely; "
382 "using null as value for last key"); 382 "using null as value for last key");
383 val = QPDFObjectHandle::newNull(); 383 val = QPDFObjectHandle::newNull();
384 - setDescription(val, offset); 384 + setDescription(val.obj, offset);
385 } else { 385 } else {
386 val = olist.at(++i); 386 val = olist.at(++i);
387 } 387 }
@@ -432,9 +432,10 @@ QPDFParser::parse(bool&amp; empty, bool content_stream) @@ -432,9 +432,10 @@ QPDFParser::parse(bool&amp; empty, bool content_stream)
432 } 432 }
433 433
434 void 434 void
435 -QPDFParser::setDescription(QPDFObjectHandle oh, qpdf_offset_t parsed_offset) 435 +QPDFParser::setDescription(
  436 + std::shared_ptr<QPDFObject>& obj, qpdf_offset_t parsed_offset)
436 { 437 {
437 - if (auto& obj = oh.obj) { 438 + if (obj) {
438 obj->setDescription(context, description, parsed_offset); 439 obj->setDescription(context, description, parsed_offset);
439 } 440 }
440 } 441 }
libqpdf/qpdf/QPDFParser.hh
@@ -42,7 +42,8 @@ class QPDFParser @@ -42,7 +42,8 @@ class QPDFParser
42 void warn(qpdf_offset_t offset, std::string const& msg) const; 42 void warn(qpdf_offset_t offset, std::string const& msg) const;
43 void warn(std::string const& msg) const; 43 void warn(std::string const& msg) const;
44 static void warn(QPDF*, QPDFExc const&); 44 static void warn(QPDF*, QPDFExc const&);
45 - void setDescription(QPDFObjectHandle oh, qpdf_offset_t parsed_offset); 45 + void setDescription(
  46 + std::shared_ptr<QPDFObject>& obj, qpdf_offset_t parsed_offset);
46 std::shared_ptr<InputSource> input; 47 std::shared_ptr<InputSource> input;
47 std::string const& object_description; 48 std::string const& object_description;
48 QPDFTokenizer& tokenizer; 49 QPDFTokenizer& tokenizer;