Commit ab80625996db48e97159f181b6e82e49a6034dd4
1 parent
c82c6d0a
Refactor filter name handling in QPDF_Stream.
Moved `expand_filter_name` calls to maintain uniformity and avoid redundant processing in filter handling. This ensures cleaner and more structured code without changing functionality.
Showing
1 changed file
with
2 additions
and
4 deletions
libqpdf/QPDF_Stream.cc
| @@ -325,14 +325,14 @@ Stream::filterable( | @@ -325,14 +325,14 @@ Stream::filterable( | ||
| 325 | // No filters | 325 | // No filters |
| 326 | } else if (filter_obj.isName()) { | 326 | } else if (filter_obj.isName()) { |
| 327 | // One filter | 327 | // One filter |
| 328 | - filter_names.push_back(filter_obj.getName()); | 328 | + filter_names.emplace_back(s->expand_filter_name(filter_obj.getName())); |
| 329 | } else if (filter_obj.isArray()) { | 329 | } else if (filter_obj.isArray()) { |
| 330 | // Potentially multiple filters | 330 | // Potentially multiple filters |
| 331 | int n = filter_obj.getArrayNItems(); | 331 | int n = filter_obj.getArrayNItems(); |
| 332 | for (int i = 0; i < n; ++i) { | 332 | for (int i = 0; i < n; ++i) { |
| 333 | QPDFObjectHandle item = filter_obj.getArrayItem(i); | 333 | QPDFObjectHandle item = filter_obj.getArrayItem(i); |
| 334 | if (item.isName()) { | 334 | if (item.isName()) { |
| 335 | - filter_names.push_back(item.getName()); | 335 | + filter_names.emplace_back(s->expand_filter_name(filter_obj.getName())); |
| 336 | } else { | 336 | } else { |
| 337 | filters_okay = false; | 337 | filters_okay = false; |
| 338 | } | 338 | } |
| @@ -350,8 +350,6 @@ Stream::filterable( | @@ -350,8 +350,6 @@ Stream::filterable( | ||
| 350 | bool filterable = true; | 350 | bool filterable = true; |
| 351 | 351 | ||
| 352 | for (auto& filter_name: filter_names) { | 352 | for (auto& filter_name: filter_names) { |
| 353 | - filter_name = s->expand_filter_name(filter_name); | ||
| 354 | - | ||
| 355 | auto ff = filter_factories.find(filter_name); | 353 | auto ff = filter_factories.find(filter_name); |
| 356 | if (ff == filter_factories.end()) { | 354 | if (ff == filter_factories.end()) { |
| 357 | filterable = false; | 355 | filterable = false; |