diff options
| author | m-holger <m-holger@kubitscheck.org> | 2022-11-15 11:49:00 +0100 |
|---|---|---|
| committer | Jay Berkenbilt <jberkenbilt@users.noreply.github.com> | 2022-11-20 18:07:22 +0100 |
| commit | 585ecf17c87d86c6fb07ebbbef703a8a859680f2 (patch) | |
| tree | bc8ccfb2a06a16c2c18bd4c543f6388d14aa8569 | |
| parent | ebc15f4dd06a00860de7cc19237deaee6ac54a1c (diff) | |
| download | qpdf-585ecf17c87d86c6fb07ebbbef703a8a859680f2.tar.zst | |
Remove redundant parameter cross_indirect from QPDFObjectHandle::copyObject
| -rw-r--r-- | include/qpdf/QPDFObjectHandle.hh | 5 | ||||
| -rw-r--r-- | libqpdf/QPDFObjectHandle.cc | 13 |
2 files changed, 5 insertions, 13 deletions
diff --git a/include/qpdf/QPDFObjectHandle.hh b/include/qpdf/QPDFObjectHandle.hh index 0e959d45..ba58fcf3 100644 --- a/include/qpdf/QPDFObjectHandle.hh +++ b/include/qpdf/QPDFObjectHandle.hh @@ -1628,10 +1628,7 @@ class QPDFObjectHandle void objectWarning(std::string const& warning); void assertType(char const* type_name, bool istype); bool dereference(); - void copyObject( - std::set<QPDFObjGen>& visited, - bool cross_indirect, - bool stop_at_streams); + void copyObject(std::set<QPDFObjGen>& visited, bool stop_at_streams); void disconnect(); void setParsedOffset(qpdf_offset_t offset); void parseContentStream_internal( diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc index 4db119a7..3362d5e6 100644 --- a/libqpdf/QPDFObjectHandle.cc +++ b/libqpdf/QPDFObjectHandle.cc @@ -2219,7 +2219,7 @@ QPDFObjectHandle::unsafeShallowCopy() void QPDFObjectHandle::copyObject( - std::set<QPDFObjGen>& visited, bool cross_indirect, bool stop_at_streams) + std::set<QPDFObjGen>& visited, bool stop_at_streams) { assertInitialized(); if (isStream()) { @@ -2259,10 +2259,7 @@ QPDFObjectHandle::copyObject( int n = array->getNItems(); for (int i = 0; i < n; ++i) { items.push_back(array->getItem(i)); - if ((cross_indirect || (!items.back().isIndirect()))) { - items.back().copyObject( - visited, cross_indirect, stop_at_streams); - } + items.back().copyObject(visited, stop_at_streams); } new_obj = QPDF_Array::create(items); } else if (isDictionary()) { @@ -2270,9 +2267,7 @@ QPDFObjectHandle::copyObject( auto dict = asDictionary(); for (auto const& key: getKeys()) { items[key] = dict->getKey(key); - if ((cross_indirect || (!items[key].isIndirect()))) { - items[key].copyObject(visited, cross_indirect, stop_at_streams); - } + items[key].copyObject(visited, stop_at_streams); } new_obj = QPDF_Dictionary::create(items); } else { @@ -2309,7 +2304,7 @@ void QPDFObjectHandle::makeDirect(bool allow_streams) { std::set<QPDFObjGen> visited; - copyObject(visited, true, allow_streams); + copyObject(visited, allow_streams); } void |