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

Refactor QPDF_Stream::getStreamJSON

Browse Source
This commit is contained in:
m-holger 2023-11-17 17:09:15 +00:00
parent 3237ef70fb
commit 4c71c8680a
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libqpdf/QPDF_Stream.cc
View File

@ -216,29 +216,28 @@ QPDF_Stream::getStreamJSON(
auto dict = this->stream_dict; auto dict = this->stream_dict;
JSON result = JSON::makeDictionary(); JSON result = JSON::makeDictionary();
if (json_data != qpdf_sj_none) { if (json_data != qpdf_sj_none) {
std::shared_ptr<Buffer> buf; Pl_Discard discard;
Pl_Buffer buf_pl{"stream data"};
// buf_pl contains valid data and is ready for retrieval of the data.
bool buf_pl_ready = false;
bool filtered = false; bool filtered = false;
bool filter = (decode_level != qpdf_dl_none); bool filter = (decode_level != qpdf_dl_none);
for (int attempt = 1; attempt <= 2; ++attempt) { for (int attempt = 1; attempt <= 2; ++attempt) {
Pl_Discard discard; Pipeline* data_pipeline = &discard;
std::shared_ptr<Pl_Buffer> buf_pl;
Pipeline* data_pipeline = nullptr;
if (json_data == qpdf_sj_file) { if (json_data == qpdf_sj_file) {
// We need to capture the data to write // We need to capture the data to write
buf_pl = std::make_shared<Pl_Buffer>("stream data"); data_pipeline = &buf_pl;
data_pipeline = buf_pl.get();
} else {
data_pipeline = &discard;
} }
bool succeeded = bool succeeded =
pipeStreamData(data_pipeline, &filtered, 0, decode_level, false, (attempt == 1)); pipeStreamData(data_pipeline, &filtered, 0, decode_level, false, (attempt == 1));
if ((!succeeded) || (filter && (!filtered))) { if (!succeeded || (filter && !filtered)) {
// Try again // Try again
filter = false; filter = false;
decode_level = qpdf_dl_none; decode_level = qpdf_dl_none;
buf_pl.getString(); // reset buf_pl
} else { } else {
if (buf_pl.get()) { if (json_data == qpdf_sj_file) {
buf = buf_pl->getBufferSharedPointer(); buf_pl_ready = true;
} }
break; break;
} }
@ -252,10 +251,10 @@ QPDF_Stream::getStreamJSON(
} }
if (json_data == qpdf_sj_file) { if (json_data == qpdf_sj_file) {
result.addDictionaryMember("datafile", JSON::makeString(data_filename)); result.addDictionaryMember("datafile", JSON::makeString(data_filename));
if (!buf.get()) { if (!buf_pl_ready) {
throw std::logic_error("QPDF_Stream: failed to get stream data in json file mode"); throw std::logic_error("QPDF_Stream: failed to get stream data in json file mode");
} }
p->write(buf->getBuffer(), buf->getSize()); p->writeString(buf_pl.getString());
} else if (json_data == qpdf_sj_inline) { } else if (json_data == qpdf_sj_inline) {
result.addDictionaryMember( result.addDictionaryMember(
"data", JSON::makeBlob(StreamBlobProvider(this, decode_level))); "data", JSON::makeBlob(StreamBlobProvider(this, decode_level)));