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

Merge pull request #926 from m-holger/omap

Browse Source 
Remove redundant parameter depth from QPDF::updateObjectMaps
This commit is contained in:
Jay Berkenbilt 2023-03-18 13:28:19 -04:00 committed by GitHub
commit 84e29026f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/qpdf/QPDF.hh
View File

@ -1633,8 +1633,7 @@ class QPDF
QPDFObjectHandle oh,
std::function<int(QPDFObjectHandle&)> skip_stream_parameters,
std::set<QPDFObjGen>& visited,
bool top,
int depth);
bool top);
void filterCompressedObjects(std::map<int, int> const& object_stream_data);
// JSON import

18
libqpdf/QPDF_optimization.cc
View File

@ -285,7 +285,7 @@ QPDF::updateObjectMaps(
std::function<int(QPDFObjectHandle&)> skip_stream_parameters)
{
std::set<QPDFObjGen> visited;
updateObjectMapsInternal(ou, oh, skip_stream_parameters, visited, true, 0);
updateObjectMapsInternal(ou, oh, skip_stream_parameters, visited, true);
}
void
@ -294,8 +294,7 @@ QPDF::updateObjectMapsInternal(
QPDFObjectHandle oh,
std::function<int(QPDFObjectHandle&)> skip_stream_parameters,
std::set<QPDFObjGen>& visited,
bool top,
int depth)
bool top)
{
// Traverse the object tree from this point taking care to avoid
// crossing page boundaries.
@ -324,12 +323,7 @@ QPDF::updateObjectMapsInternal(
int n = oh.getArrayNItems();
for (int i = 0; i < n; ++i) {
updateObjectMapsInternal(
ou,
oh.getArrayItem(i),
skip_stream_parameters,
visited,
false,
1 + depth);
ou, oh.getArrayItem(i), skip_stream_parameters, visited, false);
}
} else if (oh.isDictionary() || oh.isStream()) {
QPDFObjectHandle dict = oh;
@ -351,8 +345,7 @@ QPDF::updateObjectMapsInternal(
dict.getKey(key),
skip_stream_parameters,
visited,
false,
1 + depth);
false);
} else if (is_page_node && (key == "/Parent")) {
// Don't traverse back up the page tree
} else if (
@ -367,8 +360,7 @@ QPDF::updateObjectMapsInternal(
dict.getKey(key),
skip_stream_parameters,
visited,
false,
1 + depth);
false);
}
}
}