cache NetworkedAnimator drawables

could use a LruCache later

1 files changed, 30 insertions, 28 deletions

diff --git a/source/core/StarImageProcessing.cpp b/source/core/StarImageProcessing.cpp
index f66da30..4dfcf8a 100644
--- a/source/core/StarImageProcessing.cpp
+++ b/source/core/StarImageProcessing.cpp
@@ -174,36 +174,38 @@ ImageOperation imageOperationFromString(StringView string) {
         char ch = *ptr;
 
         if (ch == '=' || ch == ';' || ptr == end) {
-          char* c = which ? a : b;
-
-          if (hexLen == 3) {
-            nibbleDecode(hexPtr, 3, c, 4);
-            c[0] |= (c[0] << 4);
-            c[1] |= (c[1] << 4);
-            c[2] |= (c[2] << 4);
-            c[3] = 255;
-          }
-          else if (hexLen == 4) {
-            nibbleDecode(hexPtr, 4, c, 4);
-            c[0] |= (c[0] << 4);
-            c[1] |= (c[1] << 4);
-            c[2] |= (c[2] << 4);
-            c[3] |= (c[3] << 4);
-          }
-          else if (hexLen == 6) {
-            hexDecode(hexPtr, 6, c, 4);
-            c[3] = 255;
-          }
-          else if (hexLen == 8) {
-            hexDecode(hexPtr, 8, c, 4);
-          }
-          else
-            throw ImageOperationException(strf("Improper size for hex string '%s' in imageOperationFromString", StringView(hexPtr, hexLen)), false);
+          if (hexLen != 0) {
+            char* c = which ? a : b;
+
+            if (hexLen == 3) {
+              nibbleDecode(hexPtr, 3, c, 4);
+              c[0] |= (c[0] << 4);
+              c[1] |= (c[1] << 4);
+              c[2] |= (c[2] << 4);
+              c[3] = 255;
+            }
+            else if (hexLen == 4) {
+              nibbleDecode(hexPtr, 4, c, 4);
+              c[0] |= (c[0] << 4);
+              c[1] |= (c[1] << 4);
+              c[2] |= (c[2] << 4);
+              c[3] |= (c[3] << 4);
+            }
+            else if (hexLen == 6) {
+              hexDecode(hexPtr, 6, c, 4);
+              c[3] = 255;
+            }
+            else if (hexLen == 8) {
+              hexDecode(hexPtr, 8, c, 4);
+            }
+            else
+              throw ImageOperationException(strf("Improper size for hex string '%s' in imageOperationFromString", StringView(hexPtr, hexLen)), false);
 
-          if (which = !which)
-            operation.colorReplaceMap[*(Vec4B*)&a] = *(Vec4B*)&b;
+            if (which = !which)
+              operation.colorReplaceMap[*(Vec4B*)&a] = *(Vec4B*)&b;
 
-          hexLen = 0;
+            hexLen = 0;
+          }
         }
         else if (!hexLen++)
           hexPtr = ptr;