From 3efd6657039eeb5a33b01b9bd07ba3d5875f5b64 Mon Sep 17 00:00:00 2001
From: m-holger <m-holger@kubitscheck.org>
Date: Sun, 20 Nov 2022 15:06:34 +0000
Subject: Remove redundant parameters cross_indirect and stop_atstreams from
 QPDFObjectHandle::copyObject1

---
 libqpdf/QPDFObjectHandle.cc | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

(limited to 'libqpdf')

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);
-- 
cgit v1.2.3-54-g00ecf