From 7bde128a87268751e1f46174a64ffd78b03bf8bc Mon Sep 17 00:00:00 2001
From: Kae <80987908+Novaenia@users.noreply.github.com>
Date: Sat, 24 Jun 2023 19:41:52 +1000
Subject: DirectivesGroup prototype

---
 source/game/StarImageMetadataDatabase.cpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'source/game/StarImageMetadataDatabase.cpp')

diff --git a/source/game/StarImageMetadataDatabase.cpp b/source/game/StarImageMetadataDatabase.cpp
index 1e5c147..7c619d3 100644
--- a/source/game/StarImageMetadataDatabase.cpp
+++ b/source/game/StarImageMetadataDatabase.cpp
@@ -122,7 +122,8 @@ String ImageMetadataDatabase::filterProcessing(String const& path) {
   auto directives = move(components.directives);
   String joined = AssetPath::join(components);
 
-  directives.forEachPair([&](ImageOperation const& operation, String const& string) {
+  directives.forEach([&](auto const& entry) {
+    ImageOperation const& operation = entry.operation;
     if (!(operation.is<HueShiftImageOperation>()       ||
       operation.is<SaturationShiftImageOperation>()    ||
       operation.is<BrightnessMultiplyImageOperation>() ||
@@ -130,7 +131,7 @@ String ImageMetadataDatabase::filterProcessing(String const& path) {
       operation.is<ScanLinesImageOperation>()          ||
       operation.is<SetColorImageOperation>())) {
       joined += "?";
-      joined += string;
+      joined += entry.string;
     }
   });
 
@@ -229,14 +230,9 @@ Vec2U ImageMetadataDatabase::calculateImageSize(String const& path) const {
 
   OperationSizeAdjust osa(imageSize);
 
-  bool complete = components.directives.forEachAbortable([&](auto const& leaf) -> bool {
-    for (const ImageOperation& operation : leaf.operations) {
-      operation.call(osa);
-      if (osa.hasError())
-        return false;
-      else
-        return true;
-    }
+  bool complete = components.directives.forEachAbortable([&](auto const& entry) -> bool {
+    entry.operation.call(osa);
+    return !osa.hasError;
   });
 
   if (!complete)
-- 
cgit v1.2.3