Remove casting of (pointer to int) and (int to pointer). 73/149473/1
authorjinwang.an <jinwang.an@samsung.com>
Tue, 12 Sep 2017 05:36:52 +0000 (14:36 +0900)
committerjinwang.an <jinwang.an@samsung.com>
Tue, 12 Sep 2017 09:11:42 +0000 (18:11 +0900)
Change-Id: Ic277365723add48555df2c86689e56179cc98aa8
Signed-off-by: jinwang.an <jinwang.an@samsung.com>
CMakeLists.txt
src/setting-clock.c

index 9c8f06063400510b03d11a00035b4c314d8ab265..9e278395af2b342d9c6a6c8d8a315d776371e4dd 100755 (executable)
@@ -54,7 +54,7 @@ SET(FAKE_IMG_PATH "${TZ_SYS_RO_APP}/${PKGNAME}/shared/res")
 SET(CHANGEABLE_PATH "${PREFIX}/shared/res/tables")
 #ENDIF(FEATURE_SETTING_CHANGEABLE)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -Werror")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -Werror=pointer-to-int-cast -Werror=int-to-pointer-cast")
 
 
 IF(FEATURE_SETTING_SDK)
index d703aebaba8e79b326f4eb72fe043957d534f9ce..8efed45a525dbe261cd09440a22242f9c4f53f65 100644 (file)
@@ -123,6 +123,17 @@ static char *font_size_str[] = {
        "IDS_ST_BODY_LARGE_M_FONT_SIZE_ABB2"
 };
 
+static char *bg_path_str[] = {
+        SETTING_HOME_SCREEN_DIR_PATH"/BG_preview_00.png",
+        SETTING_HOME_SCREEN_DIR_PATH"/BG_preview_01.png",
+        SETTING_HOME_SCREEN_DIR_PATH"/BG_preview_02.png",
+        SETTING_HOME_SCREEN_DIR_PATH"/BG_preview_03.png",
+        SETTING_HOME_SCREEN_DIR_PATH"/BG_preview_04.png",
+        SETTING_HOME_SCREEN_DIR_PATH"/BG_preview_05.png",
+        SETTING_HOME_SCREEN_DIR_PATH"/BG_preview_06.png",
+        SETTING_HOME_SCREEN_DIR_PATH"/BG_preview_07.png"
+};
+
 enum {
        CLOCK_TITLE_CLOCK,
        CLOCK_TITLE_LANGUAGE,
@@ -860,9 +871,7 @@ static void _bg_mouse_up_cb(void *data, Evas *evas, Evas_Object *obj, void *even
        if (bg_touch_mode == TOUCH_MOVE)
                return;
 
-       int img_idx = (int)data;
-       char img_path[512] = {0};
-       snprintf(img_path, 511, SETTING_HOME_SCREEN_DIR_PATH"/BG_preview_%02d.png",img_idx);
+       char* img_path = (char*)data;
 
        bg_prev_x = 0;
        bg_touch_mode = NONE;
@@ -1018,7 +1027,7 @@ static Evas_Object *_create_background_index(Evas_Object *parent, void *data)
 
                        /* touch event */
                        evas_object_event_callback_add(page, EVAS_CALLBACK_MOUSE_DOWN, _bg_mouse_down_cb, NULL);
-                       evas_object_event_callback_add(page, EVAS_CALLBACK_MOUSE_UP, _bg_mouse_up_cb, (void *)i);
+                       evas_object_event_callback_add(page, EVAS_CALLBACK_MOUSE_UP, _bg_mouse_up_cb, bg_path_str[i]);
                        evas_object_event_callback_add(page, EVAS_CALLBACK_MOUSE_MOVE, _bg_mouse_move_cb, NULL);
 
                        elm_object_part_content_set(clock_layout, "clock-image", page);