octoleo
/
qpdf
mirror of https://github.com/qpdf/qpdf.git
2
1
Fork 0
Code Issues Releases Wiki Activity

Remove redundant parameter first_level_only from QPDFObjectHandle::copyObject

This commit is contained in:
m-holger 2022-11-15 10:21:25 +00:00 committed by Jay Berkenbilt
parent 64059014c9
commit ebc15f4dd0
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/qpdf/QPDFObjectHandle.hh
View File

@ -1631,7 +1631,6 @@ class QPDFObjectHandle
void copyObject(
std::set<QPDFObjGen>& visited,
bool cross_indirect,
bool first_level_only,
bool stop_at_streams);
void disconnect();
void setParsedOffset(qpdf_offset_t offset);

19
libqpdf/QPDFObjectHandle.cc
View File

@ -2219,13 +2219,9 @@ QPDFObjectHandle::unsafeShallowCopy()
void
QPDFObjectHandle::copyObject(
std::set<QPDFObjGen>& visited,
bool cross_indirect,
bool first_level_only,
bool stop_at_streams)
std::set<QPDFObjGen>& visited, bool cross_indirect, bool stop_at_streams)
{
assertInitialized();
if (isStream()) {
QTC::TC(
"qpdf", "QPDFObjectHandle copy stream", stop_at_streams ? 0 : 1);
@ -2263,10 +2259,9 @@ QPDFObjectHandle::copyObject(
int n = array->getNItems();
for (int i = 0; i < n; ++i) {
items.push_back(array->getItem(i));
if ((!first_level_only) &&
(cross_indirect || (!items.back().isIndirect()))) {
if ((cross_indirect || (!items.back().isIndirect()))) {
items.back().copyObject(
visited, cross_indirect, first_level_only, stop_at_streams);
visited, cross_indirect, stop_at_streams);
}
}
new_obj = QPDF_Array::create(items);
@ -2275,10 +2270,8 @@ QPDFObjectHandle::copyObject(
auto dict = asDictionary();
for (auto const& key: getKeys()) {
items[key] = dict->getKey(key);
if ((!first_level_only) &&
(cross_indirect || (!items[key].isIndirect()))) {
items[key].copyObject(
visited, cross_indirect, first_level_only, stop_at_streams);
if ((cross_indirect || (!items[key].isIndirect()))) {
items[key].copyObject(visited, cross_indirect, stop_at_streams);
}
}
new_obj = QPDF_Dictionary::create(items);
@ -2316,7 +2309,7 @@ void
QPDFObjectHandle::makeDirect(bool allow_streams)
{
std::set<QPDFObjGen> visited;
copyObject(visited, true, false, allow_streams);
copyObject(visited, true, allow_streams);
}
void