octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-12-31 05:51:51 +00:00
Code Issues Releases Wiki Activity

Add new private method QPDF::readObjectInStream

Browse Source
This commit is contained in:
m-holger 2023-07-07 20:14:59 +01:00
parent 098b98c889
commit 2bf7359e35
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/qpdf/QPDF.hh
View File

@ -1011,6 +1011,7 @@ class QPDF
std::string const& description,
QPDFObjGen const& og,
bool in_object_stream);
QPDFObjectHandle readObjectInStream(std::shared_ptr<InputSource>, QPDFObjGen og);
size_t recoverStreamLength(
std::shared_ptr<InputSource> input, QPDFObjGen const& og, qpdf_offset_t stream_offset);
QPDFTokenizer::Token readToken(std::shared_ptr<InputSource>, size_t max_len = 0);

22
libqpdf/QPDF.cc
View File

@ -1389,6 +1389,26 @@ QPDF::readObject(
return object;
}
QPDFObjectHandle
QPDF::readObjectInStream(std::shared_ptr<InputSource> input, QPDFObjGen og)
{
setLastObjectDescription("", og);
qpdf_offset_t offset = input->tell();
bool empty = false;
auto object = QPDFParser(input, m->last_object_description, m->tokenizer, nullptr, this)
.parse(empty, false);
if (empty) {
// Nothing in the PDF spec appears to allow empty objects, but they have been encountered in
// actual PDF files and Adobe Reader appears to ignore them.
warn(damagedPDF(input, input->getLastOffset(), "empty object treated as null"));
}
// Override last_offset so that it points to the beginning of the object we just read
input->setLastOffset(offset);
return object;
}
bool
QPDF::findEndstream()
{
@ -1750,7 +1770,7 @@ QPDF::resolveObjectsInStream(int obj_stream_number)
if ((entry.getType() == 2) && (entry.getObjStreamNumber() == obj_stream_number)) {
int offset = iter.second;
input->seek(offset, SEEK_SET);
QPDFObjectHandle oh = readObject(input, "", og, true);
QPDFObjectHandle oh = readObjectInStream(input, og);
updateCache(og, oh.getObj(), end_before_space, end_after_space);
} else {
QTC::TC("qpdf", "QPDF not caching overridden objstm object");