Fix possible Unicode exception in Directives parsing

2 files changed, 8 insertions, 8 deletions

diff --git a/source/core/StarDirectives.cpp b/source/core/StarDirectives.cpp
index 5d5266f..245c8c0 100644
--- a/source/core/StarDirectives.cpp
+++ b/source/core/StarDirectives.cpp
@@ -124,7 +124,7 @@ void Directives::parse(String&& directives) {
     return;
   }
 
-  List<Entry> newList;
+  List<Entry> entries;
   StringView view(directives);
   StringView prefix = "";
   view.forEachSplitView("?", [&](StringView split, size_t beg, size_t end) {
@@ -132,7 +132,7 @@ void Directives::parse(String&& directives) {
       if (beg == 0) {
         try {
           ImageOperation operation = imageOperationFromString(split);
-          newList.emplace_back(std::move(operation), beg, end);
+          entries.emplace_back(std::move(operation), beg, end);
         }
         catch (StarException const& e) {
           prefix = split;
@@ -141,18 +141,18 @@ void Directives::parse(String&& directives) {
       }
       else {
         ImageOperation operation = NullImageOperation();
-        newList.emplace_back(std::move(operation), beg, end);
+        entries.emplace_back(std::move(operation), beg, end);
       }
     }
-  });
+    });
 
-  if (newList.empty() && !prefix.empty()) {
+  if (entries.empty() && !prefix.empty()) {
     shared.reset();
     return;
   }
 
-  shared = std::make_shared<Shared const>(std::move(newList), std::move(directives), prefix);
-  if (view.size() < 1000) { // Pre-load short enough directives
+  shared = std::make_shared<Shared const>(std::move(entries), std::move(directives), prefix);
+  if (view.utf8().size() < 1000) { // Pre-load short enough directives
     for (auto& entry : shared->entries)
       entry.loadOperation(*shared);
   }
diff --git a/source/core/StarImageProcessing.cpp b/source/core/StarImageProcessing.cpp
index f3a3108..a56cedc 100644
--- a/source/core/StarImageProcessing.cpp
+++ b/source/core/StarImageProcessing.cpp
@@ -230,7 +230,7 @@ ImageOperation imageOperationFromString(StringView string) {
         bits.emplace_back(split);
     });
 
-    String type = bits.at(0);
+    StringView const& type = bits.at(0);
 
     if (type == "hueshift") {
       return HueShiftImageOperation::hueShiftDegrees(lexicalCast<float>(bits.at(1)));