Merge pull request lancaster-university#325 from dpgeorge/image-remov…

…e-atoi Rewrite MicroBitImage parsing code so it doesn't depend on atoi()
calliope-mini · Dec 19, 2017 · 2cff906 · 2cff906
2 parents 6fa716f + fbfee49
commit 2cff906
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/source/types/MicroBitImage.cpp b/source/types/MicroBitImage.cpp
@@ -117,10 +117,8 @@ MicroBitImage::MicroBitImage(const char *s)
     int count = 0;
     int digit = 0;
 
-    char parseBuf[10];
-
     const char *parseReadPtr;
-    char *parseWritePtr;
+    int parseValue;
     uint8_t *bitmapPtr;
 
     if (s == NULL)
@@ -169,24 +167,26 @@ MicroBitImage::MicroBitImage(const char *s)
 
     // Second pass: collect the data.
     parseReadPtr = s;
-    parseWritePtr = parseBuf;
+    parseValue = -1;
     bitmapPtr = this->getBitmap();
 
     while (*parseReadPtr)
     {
         if (isdigit(*parseReadPtr))
         {
-            *parseWritePtr = *parseReadPtr;
-            parseWritePtr++;
+            if (parseValue < 0)
+            {
+                parseValue = 0;
+            }
+            parseValue = parseValue * 10 + *parseReadPtr - '0';
         }
         else
         {
-            *parseWritePtr = 0;
-            if (parseWritePtr > parseBuf)
+            if (parseValue >= 0)
             {
-                *bitmapPtr = atoi(parseBuf);
+                *bitmapPtr = parseValue;
                 bitmapPtr++;
-                parseWritePtr = parseBuf;
+                parseValue = -1;
             }
         }