diff options
| author | m-holger <m-holger@kubitscheck.org> | 2022-11-20 16:06:34 +0100 |
|---|---|---|
| committer | Jay Berkenbilt <jberkenbilt@users.noreply.github.com> | 2022-11-20 18:07:22 +0100 |
| commit | 3efd6657039eeb5a33b01b9bd07ba3d5875f5b64 (patch) | |
| tree | 988e3f23daf31cd6512656a9deab015b739f2a05 | |
| parent | d7b85252356da91293d9c11428a5a1c797c5dd0d (diff) | |
| download | qpdf-3efd6657039eeb5a33b01b9bd07ba3d5875f5b64.tar.zst | |
Remove redundant parameters cross_indirect and stop_atstreams from QPDFObjectHandle::copyObject1
| -rw-r--r-- | include/qpdf/QPDFObjectHandle.hh | 6 | ||||
| -rw-r--r-- | libqpdf/QPDFObjectHandle.cc | 22 |
2 files changed, 7 insertions, 21 deletions
diff --git a/include/qpdf/QPDFObjectHandle.hh b/include/qpdf/QPDFObjectHandle.hh index 24a3bead..e4e8d753 100644 --- a/include/qpdf/QPDFObjectHandle.hh +++ b/include/qpdf/QPDFObjectHandle.hh @@ -1628,11 +1628,7 @@ class QPDFObjectHandle void objectWarning(std::string const& warning); void assertType(char const* type_name, bool istype); bool dereference(); - void copyObject1( - std::set<QPDFObjGen>& visited, - bool cross_indirect, - bool first_level_only, - bool stop_at_streams); + void copyObject1(std::set<QPDFObjGen>& visited, bool first_level_only); void shallowCopyInternal1(QPDFObjectHandle& oh, bool first_level_only); void copyObject( std::set<QPDFObjGen>& visited, diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc index 9153e33f..6c5055a7 100644 --- a/libqpdf/QPDFObjectHandle.cc +++ b/libqpdf/QPDFObjectHandle.cc @@ -2218,22 +2218,16 @@ QPDFObjectHandle::shallowCopyInternal1( new_obj = QPDFObjectHandle(obj->copy(true)); std::set<QPDFObjGen> visited; - new_obj.copyObject1(visited, false, first_level_only, false); + new_obj.copyObject1(visited, first_level_only); } void QPDFObjectHandle::copyObject1( - std::set<QPDFObjGen>& visited, - bool cross_indirect, - bool first_level_only, - bool stop_at_streams) + std::set<QPDFObjGen>& visited, bool first_level_only) { assertInitialized(); if (isStream()) { - if (stop_at_streams) { - return; - } throw std::runtime_error( "attempt to make a stream into a direct object"); } @@ -2264,10 +2258,8 @@ QPDFObjectHandle::copyObject1( 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()))) { - items.back().copyObject1( - visited, cross_indirect, first_level_only, stop_at_streams); + if ((!first_level_only) && !items.back().isIndirect()) { + items.back().copyObject1(visited, first_level_only); } } new_obj = QPDF_Array::create(items); @@ -2276,10 +2268,8 @@ QPDFObjectHandle::copyObject1( auto dict = asDictionary(); for (auto const& key: getKeys()) { items[key] = dict->getKey(key); - if ((!first_level_only) && - (cross_indirect || (!items[key].isIndirect()))) { - items[key].copyObject1( - visited, cross_indirect, first_level_only, stop_at_streams); + if ((!first_level_only) && !items[key].isIndirect()) { + items[key].copyObject1(visited, first_level_only); } } new_obj = QPDF_Dictionary::create(items); |