Refactor stream filtering to simplify decode-level handling.

Replaced individual compression flags with a unified decode-level parameter for stream filtering. Introduced a helper function to handle filtering conditions, reducing redundancy and improving readability. Removed unused code and updated related tests to reflect these changes.

Refactor stream filtering to simplify decode-level handling.
Replaced individual compression flags with a unified decode-level parameter for stream filtering. Introduced a helper function to handle filtering conditions, reducing redundancy and improving readability. Removed unused code and updated related tests to reflect these changes.
m-holger
1 parent 1527bf29
Showing 3 changed files with 18 additions and 41 deletions
libqpdf/QPDF_Stream.cc
libqpdf/qpdf/QPDFObjectHandle_private.hh
qpdf/qpdf.testcov
@@ -343,9 +343,8 @@ Stream::isRootMetadata() const
  
 bool
 Stream::filterable(
-    std::vector<std::shared_ptr<QPDFStreamFilter>>& filters,
-    bool& specialized_compression,
-    bool& lossy_compression)
+    qpdf_stream_decode_level_e decode_level,
+    std::vector<std::shared_ptr<QPDFStreamFilter>>& filters)
 {
     auto s = stream();
     // Check filters
@@ -387,6 +386,16 @@ Stream::filterable(
  
     auto decode_obj = s->stream_dict.getKey("/DecodeParms");
  
+    auto can_filter = // linebreak
+        [](auto d_level, auto& filter, auto& d_obj) -> bool {
+        if (!filter.setDecodeParms(d_obj) ||
+            (d_level < qpdf_dl_all && filter.isLossyCompression()) ||
+            (d_level < qpdf_dl_specialized && filter.isSpecializedCompression())) {
+            return false;
+        }
+        return true;
+    };
+
     auto decode_array = decode_obj.as_array(strict);
     if (!decode_array || decode_array.size() == 0) {
         if (decode_array) {
@@ -394,17 +403,9 @@ Stream::filterable(
         }
  
         for (auto& filter: filters) {
-            if (!filter->setDecodeParms(decode_obj)) {
+            if (!can_filter(decode_level, *filter, decode_obj)) {
                 return false;
             }
-            if (filter->isLossyCompression()) {
-                specialized_compression = true;
-                lossy_compression = true;
-                continue;
-            }
-            if (filter->isSpecializedCompression()) {
-                specialized_compression = true;
-            }
         }
     } else {
         // Ignore /DecodeParms entirely if /Filters is empty.  At least one case of a file whose
@@ -416,17 +417,10 @@ Stream::filterable(
  
         int i = -1;
         for (auto& filter: filters) {
-            if (!filter->setDecodeParms(decode_array.at(++i).second)) {
+            auto d_obj = decode_array.at(++i).second;
+            if (!can_filter(decode_level, *filter, d_obj)) {
                 return false;
             }
-            if (filter->isLossyCompression()) {
-                specialized_compression = true;
-                lossy_compression = true;
-                continue;
-            }
-            if (filter->isSpecializedCompression()) {
-                specialized_compression = true;
-            }
         }
     }
  
@@ -444,8 +438,6 @@ Stream::pipeStreamData(
 {
     auto s = stream();
     std::vector<std::shared_ptr<QPDFStreamFilter>> filters;
-    bool specialized_compression = false;
-    bool lossy_compression = false;
     bool ignored;
     if (!filterp) {
         filterp = &ignored;
@@ -453,20 +445,7 @@ Stream::pipeStreamData(
     bool& filter = *filterp;
     filter = encode_flags || decode_level != qpdf_dl_none;
     if (filter) {
-        filter = filterable(filters, specialized_compression, lossy_compression);
-        if ((decode_level < qpdf_dl_all) && lossy_compression) {
-            filter = false;
-        }
-        if (decode_level < qpdf_dl_specialized && specialized_compression) {
-            filter = false;
-        }
-        QTC::TC(
-            "qpdf",
-            "QPDF_Stream special filters",
-            (!filter)                     ? 0
-                : lossy_compression       ? 1
-                : specialized_compression ? 2
-                                          : 3);
+        filter = filterable(decode_level, filters);
     }
  
     if (!pipeline) {
@@ -312,9 +312,8 @@ namespace qpdf
             return nullptr; // unreachable
         }
         bool filterable(
-            std::vector<std::shared_ptr<QPDFStreamFilter>>& filters,
-            bool& specialized_compression,
-            bool& lossy_compression);
+            qpdf_stream_decode_level_e decode_level,
+            std::vector<std::shared_ptr<QPDFStreamFilter>>& filters);
         void replaceFilterData(
             QPDFObjectHandle const& filter, QPDFObjectHandle const& decode_parms, size_t length);
  
@@ -278,7 +278,6 @@ QPDF ignore second extra space in xref entry 0
 QPDF ignore length error xref entry 0
 QPDF_encryption pad short parameter 0
 QPDFObjectHandle found old angle 1
-QPDF_Stream special filters 3
 QPDFTokenizer block long token 0
 qpdf-c called qpdf_set_decode_level 0
 qpdf-c called qpdf_set_compress_streams 0