From 5af32b53a36a66698e8762d026f92f0ed8cde710 Mon Sep 17 00:00:00 2001 From: m-holger Date: Wed, 15 Mar 2023 17:45:49 +0000 Subject: Remove redundant parameter depth from QPDF::updateObjectMaps --- include/qpdf/QPDF.hh | 3 +-- libqpdf/QPDF_optimization.cc | 18 +++++------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/include/qpdf/QPDF.hh b/include/qpdf/QPDF.hh index 5cc7a2f2..13b66977 100644 --- a/include/qpdf/QPDF.hh +++ b/include/qpdf/QPDF.hh @@ -1633,8 +1633,7 @@ class QPDF QPDFObjectHandle oh, std::function skip_stream_parameters, std::set& visited, - bool top, - int depth); + bool top); void filterCompressedObjects(std::map const& object_stream_data); // JSON import diff --git a/libqpdf/QPDF_optimization.cc b/libqpdf/QPDF_optimization.cc index 1fe0b74f..41204fbd 100644 --- a/libqpdf/QPDF_optimization.cc +++ b/libqpdf/QPDF_optimization.cc @@ -285,7 +285,7 @@ QPDF::updateObjectMaps( std::function skip_stream_parameters) { std::set visited; - updateObjectMapsInternal(ou, oh, skip_stream_parameters, visited, true, 0); + updateObjectMapsInternal(ou, oh, skip_stream_parameters, visited, true); } void @@ -294,8 +294,7 @@ QPDF::updateObjectMapsInternal( QPDFObjectHandle oh, std::function skip_stream_parameters, std::set& visited, - bool top, - int depth) + bool top) { // Traverse the object tree from this point taking care to avoid // crossing page boundaries. @@ -324,12 +323,7 @@ QPDF::updateObjectMapsInternal( int n = oh.getArrayNItems(); for (int i = 0; i < n; ++i) { updateObjectMapsInternal( - ou, - oh.getArrayItem(i), - skip_stream_parameters, - visited, - false, - 1 + depth); + ou, oh.getArrayItem(i), skip_stream_parameters, visited, false); } } else if (oh.isDictionary() || oh.isStream()) { QPDFObjectHandle dict = oh; @@ -351,8 +345,7 @@ QPDF::updateObjectMapsInternal( dict.getKey(key), skip_stream_parameters, visited, - false, - 1 + depth); + false); } else if (is_page_node && (key == "/Parent")) { // Don't traverse back up the page tree } else if ( @@ -367,8 +360,7 @@ QPDF::updateObjectMapsInternal( dict.getKey(key), skip_stream_parameters, visited, - false, - 1 + depth); + false); } } } -- cgit v1.2.3-54-g00ecf