Bring dependency on libf8 to painter module only

1 files changed, 4 insertions, 22 deletions

diff --git a/src/text.c b/src/text.c
index 4674a7e..2ce74fd 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1,4 +1,3 @@
-#include <f8.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -69,22 +68,6 @@ static char *texts_cjson_get_string(cJSON *object, const char *key)
     return string;
 }
 
-static wchar_t *texts_cjson_get_string_utf32(cJSON *object, const char *key)
-{
-    wchar_t *string = NULL;
-    cJSON *item = cJSON_GetObjectItem(object, key);
-    if (cJSON_IsString(item)) {
-        char *value = cJSON_GetStringValue(item);
-        if (value != NULL) {
-            size_t size = utf8_strlen(value) + 1;
-            string = calloc(size, sizeof(wchar_t));
-            if (string != NULL)
-                utf8to32_strcpy(string, value);
-        }
-    }
-    return string;
-}
-
 static int texts_cjson_get_int(cJSON *object, const char *key)
 {
     int value = 0;
@@ -131,7 +114,7 @@ struct idlist *load_texts_from_json(const char *filename)
 
                 text->type = texts_cjson_get_string(item, "type");
                 text->scene = texts_cjson_get_string(item, "scene");
-                text->text = texts_cjson_get_string_utf32(item, "text");
+                text->text = texts_cjson_get_string(item, "text");
                 text->font = texts_cjson_get_string(item, "font");
                 text->size = texts_cjson_get_int(item, "size");
                 text->pos.x = texts_cjson_get_int(item, "x");
@@ -200,10 +183,9 @@ struct idlist *load_texts(char *filename)
                         * (strlen((char *)ev.data.scalar.value) + 1));
                 strcpy(text->scene, (char *)ev.data.scalar.value);
             } else if (!strcmp((char *)event.data.scalar.value, "text")) {
-                text->text
-                    = calloc((utf8_strlen((char *)ev.data.scalar.value)) + 1,
-                        sizeof(size_t));
-                utf8to32_strcpy(text->text, (char *)ev.data.scalar.value);
+                text->text = malloc(sizeof(char)
+                        * (strlen((char *)ev.data.scalar.value) + 1));
+                strcpy(text->text, (char *)ev.data.scalar.value);
             } else if (!strcmp((char *)event.data.scalar.value, "font")) {
                 text->font = malloc(sizeof(char)
                         * (strlen((char *)ev.data.scalar.value) + 1));