Fix image checker to resolve C# crash

[platform/core/api/system-settings.git] / libutil / sstu.c

diff --git a/libutil/sstu.c b/libutil/sstu.c
index cebc179..633178e 100644 (file)
--- a/libutil/sstu.c
+++ b/libutil/sstu.c
@@ -22,7 +22,6 @@
 #include <efl_extension.h>
 #include "system_settings.h"
 #include "sst.h"
-#include "sst_core.h"
 
 #ifdef TIZEN_WEARABLE
 #define SMALL_FONT_DPI                                         (-90)
@@ -74,14 +73,21 @@ static char* _get_main_font_family(char *alias)
 
        /* do matching */
        set = FcFontSort(font_config, pat, FcTrue, NULL, &res);
-       if (set) {
-               if (0 < set->nfont) {
-                       FcPatternGetString(set->fonts[0], FC_FAMILY, 0, &family);
+       do {
+               if (set && 0 < set->nfont) {
+                       int result = FcPatternGetString(set->fonts[0], FC_FAMILY, 0, &family);
+                       if (FcResultMatch != result) {
+                               ERR("FcPatternGetString() Fail(%d)", result);
+                               ret = NULL;
+                               break;
+                       }
                        if (family)
                                ret = strdup((char*)family);
                }
+       } while(0);
+
+       if (set)
                FcFontSetDestroy(set);
-       }
 
        FcPatternDestroy(pat);
        FcConfigDestroy(font_config);
@@ -89,17 +95,17 @@ static char* _get_main_font_family(char *alias)
        return ret;
 }
 
-API bool sstu_is_valid_image(char *path)
+API bool sstu_is_valid_image(const char *path)
 {
        void *ee;
        void *evas;
 
-       if (ecore_evas_init()) {
+       if (0 == ecore_evas_init()) {
                ERR("ecore_evas_init() Fail");
                return false;
        }
 
-       ee = ecore_evas_new(NULL, 0, 0, 100, 100, NULL);
+       ee = ecore_evas_buffer_new(100, 100);
        evas = ecore_evas_get(ee);
 
        void *img = evas_object_image_add(evas);
@@ -122,7 +128,7 @@ API void sstu_font_config_set_notification()
 {
 }
 
-API int sstu_is_available_font(char *font_name)
+API int sstu_is_available_font(const char *font_name)
 {
        FcObjectSet *os;
        FcFontSet *fs;
@@ -264,10 +270,10 @@ static int _get_font_size()
        return font_size;
 }
 
-API bool sstu_set_font_config(char *font_name)
+API bool sstu_set_font_config(const char *font_name)
 {
        int font_size = _get_font_size();
-       return eext_config_font_set(font_name, font_size);
+       return eext_config_font_set((char*)font_name, font_size);
 }
 
 API void sstu_set_font_size()