X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fbin%2Ftest_flip_page.c;h=5fbb9dfb3a1c593fd4215e74a698e0b66895b956;hb=55a7e1dcc1a9fd3dfac0a5d6e5e9caf1d0ba08a8;hp=20cafb3f6ed92614534cee345ddcc2c036a76743;hpb=dbb9b33dd9ab302713744fa4acbf10c80a36f34a;p=framework%2Fuifw%2Felementary.git

diff --git a/src/bin/test_flip_page.c b/src/bin/test_flip_page.c
index 20cafb3..5fbb9df 100644
--- a/src/bin/test_flip_page.c
+++ b/src/bin/test_flip_page.c
@@ -2,7 +2,6 @@
 # include "elementary_config.h"
 #endif
 #include <Elementary.h>
-#ifndef ELM_LIB_QUICKLAUNCH
 
 typedef struct _State State;
 typedef struct _Slice Slice;
@@ -63,15 +62,15 @@ static State state =
 };
 
 static Slice *
-_slice_new(State *st __UNUSED__, Evas_Object *obj)
+_slice_new(State *st EINA_UNUSED, Evas_Object *obj)
 {
    Slice *sl;
 
    sl = calloc(1, sizeof(Slice));
    if (!sl) return NULL;
    sl->obj = evas_object_image_add(evas_object_evas_get(obj));
-   evas_object_image_smooth_scale_set(sl->obj, 0);
-   evas_object_pass_events_set(sl->obj, 1);
+   evas_object_image_smooth_scale_set(sl->obj, EINA_FALSE);
+   evas_object_pass_events_set(sl->obj, EINA_TRUE);
    evas_object_image_source_set(sl->obj, obj);
    return sl;
 }
@@ -85,7 +84,7 @@ _slice_free(Slice *sl)
 
 static void
 _slice_apply(State *st, Slice *sl,
-             Evas_Coord x __UNUSED__, Evas_Coord y __UNUSED__, Evas_Coord w, Evas_Coord h __UNUSED__,
+             Evas_Coord x EINA_UNUSED, Evas_Coord y EINA_UNUSED, Evas_Coord w, Evas_Coord h EINA_UNUSED,
              Evas_Coord ox, Evas_Coord oy, Evas_Coord ow, Evas_Coord oh)
 {
    Evas_Map *m;
@@ -93,7 +92,7 @@ _slice_apply(State *st, Slice *sl,
 
    m = evas_map_new(4);
    if (!m) return;
-   evas_map_smooth_set(m, 0);
+   evas_map_smooth_set(m, EINA_FALSE);
    for (i = 0; i < 4; i++)
      {
         evas_map_point_color_set(m, i, 255, 255, 255, 255);
@@ -129,7 +128,7 @@ _slice_apply(State *st, Slice *sl,
 }
 
 static void
-_slice_3d(State *st __UNUSED__, Slice *sl, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
+_slice_3d(State *st EINA_UNUSED, Slice *sl, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
 {
    Evas_Map *m = (Evas_Map *)evas_object_map_get(sl->obj);
    int i;
@@ -149,7 +148,7 @@ _slice_3d(State *st __UNUSED__, Slice *sl, Evas_Coord x, Evas_Coord y, Evas_Coor
 }
 
 static void
-_slice_light(State *st __UNUSED__, Slice *sl, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
+_slice_light(State *st EINA_UNUSED, Slice *sl, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
 {
    Evas_Map *m = (Evas_Map *)evas_object_map_get(sl->obj);
    int i;
@@ -177,7 +176,7 @@ _slice_light(State *st __UNUSED__, Slice *sl, Evas_Coord x, Evas_Coord y, Evas_C
 }
 
 static void
-_slice_xyz(State *st __UNUSED__, Slice *sl,
+_slice_xyz(State *st EINA_UNUSED, Slice *sl,
            double xx1, double yy1, double zz1,
            double xx2, double yy2, double zz2,
            double xx3, double yy3, double zz3,
@@ -190,7 +189,7 @@ _slice_xyz(State *st __UNUSED__, Slice *sl,
 }
 
 static void
-_slice_uv(State *st __UNUSED__, Slice *sl,
+_slice_uv(State *st EINA_UNUSED, Slice *sl,
            double u1, double v1,
            double u2, double v2,
            double u3, double v3,
@@ -317,7 +316,7 @@ _state_update(State *st)
    Slice *sl;
    double b, minv = 0.0, minva, mgrad;
    int gx, gy, gszw, gszh, gw, gh, col, row, nw, nh;
-   double rho, A, theta, perc, percm, n, rhol, Al, thetal;
+   double rho, A, theta, perc, n, rhol, Al, thetal;
    Vertex3 *tvo, *tvol;
 
    st->backflip = 0;
@@ -409,11 +408,8 @@ _state_update(State *st)
      }
 
    perc = (double)xx2 / (double)xx1;
-   percm = (double)mx / (double)xx1;
    if (perc < 0.0) perc = 0.0;
    else if (perc > 1.0) perc = 1.0;
-   if (percm < 0.0) percm = 0.0;
-   else if (percm > 1.0) percm = 1.0;
 
    minva = atan(minv) / (M_PI / 2);
    if (minva < 0.0) minva = -minva;
@@ -520,6 +516,8 @@ _state_update(State *st)
           {
              Vertex3 vo[4];
 
+             memset(vo, 0, sizeof(vo));
+
              if (b > 0) nn = num + st->slices_h - row - 1;
              else nn = num + row;
 
@@ -737,7 +735,7 @@ _update_curl_job(void *data)
 }
 
 static void
-im_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+im_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    State *st = &state;
    Evas_Event_Mouse_Down *ev = event_info;
@@ -764,7 +762,7 @@ im_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
 }
 
 static void
-im_up_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+im_up_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    State *st = &state;
    Evas_Event_Mouse_Up *ev = event_info;
@@ -816,7 +814,7 @@ im_up_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
 }
 
 static void
-im_move_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+im_move_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    State *st = &state;
    Evas_Event_Mouse_Move *ev = event_info;
@@ -833,7 +831,7 @@ im_move_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_
 }
 
 void
-test_flip_page(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+test_flip_page(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Evas_Object *win, *im, *im2, *rc;
    char buf[PATH_MAX];
@@ -866,7 +864,6 @@ test_flip_page(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
 
    evas_object_data_set(im, "im2", im2);
 
-
    rc = evas_object_rectangle_add(evas_object_evas_get(win));
    evas_object_color_set(rc, 0, 0, 0, 0);
    evas_object_move(rc, 40, 340);
@@ -910,4 +907,3 @@ test_flip_page(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    evas_object_resize(win, 480, 480);
    evas_object_show(win);
 }
-#endif