diff options
| author | m-holger <m-holger@kubitscheck.org> | 2022-11-15 11:21:25 +0100 |
|---|---|---|
| committer | Jay Berkenbilt <jberkenbilt@users.noreply.github.com> | 2022-11-20 18:07:22 +0100 |
| commit | ebc15f4dd06a00860de7cc19237deaee6ac54a1c (patch) | |
| tree | cac216dca589fbb222b436a938265df5cb8f58fd | |
| parent | 64059014c9288e740214be8242cac4a29e29284c (diff) | |
| download | qpdf-ebc15f4dd06a00860de7cc19237deaee6ac54a1c.tar.zst | |
Remove redundant parameter first_level_only from QPDFObjectHandle::copyObject
| -rw-r--r-- | include/qpdf/QPDFObjectHandle.hh | 1 | ||||
| -rw-r--r-- | libqpdf/QPDFObjectHandle.cc | 19 |
2 files changed, 6 insertions, 14 deletions
diff --git a/include/qpdf/QPDFObjectHandle.hh b/include/qpdf/QPDFObjectHandle.hh index 27b9f9e0..0e959d45 100644 --- a/include/qpdf/QPDFObjectHandle.hh +++ b/include/qpdf/QPDFObjectHandle.hh @@ -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); diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc index 6b4d2cd8..4db119a7 100644 --- a/libqpdf/QPDFObjectHandle.cc +++ b/libqpdf/QPDFObjectHandle.cc @@ -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 |