Merge remote-tracking branch 'remotes/origin/upstream'

diff --git a/AUTHORS b/AUTHORS
index 7af8764..39e0b2e 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,3 +3,4 @@ Tim Horton <hortont424@gmail.com>
 Saumsung Electronics <tbd>
 Samsung SAIT <tbd>
 Bruno Tarquini <btarquini@gmail.com>
+ChunEon Park (Hermet) <hermet@hermet.pe.kr>

diff --git a/ChangeLog b/ChangeLog
index 1409c0b..4ba63b5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
-2011-12-02 Carsten Haitzler (The Rasterman)
+2011-12-02  Carsten Haitzler (The Rasterman)
 
         1.1.0 release
+
+2012-04-26  Carsten Haitzler (The Rasterman)
+
+        1.2.0 release
+
+2012-05-02  Cedric Bail
+
+       * Do not allocate more than once Evas_Map.

diff --git a/NEWS b/NEWS
index f514785..9b03eff 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+Expedite 1.3.0
+
+Changes since Expedite 1.2.0:
+-----------------------------
+
+Improvements:
+
+   * Don't over allocate Evas_Map.
+
 Expedite 1.2.0
 
 Changes since Expedite 1.1.0:

diff --git a/configure.ac b/configure.ac
index 4e8d0cc..06f5c57 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 # get rid of that stupid cache mechanism
 rm -f config.cache
 
-AC_INIT([expedite], [1.2.0]-beta, [enlightenment-devel@lists.sourceforge.net])
+AC_INIT([expedite], [1.2.99], [enlightenment-devel@lists.sourceforge.net])
 AC_PREREQ([2.52])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_HEADERS([config.h])

diff --git a/expedite.oe b/expedite.oe
deleted file mode 100644 (file)
index acae6e6..0000000
--- a/expedite.oe
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "Expedite Evas benchmark/test suite"
-HOMEPAGE = "http://www.enlightenment.org"
-MAINTAINER = "Carsten Haitzler (Rasterman) <raster@rasterman.com>"
-SECTION = "e/test"
-PRIORITY = "optional"
-DEPENDS = "evas"
-PV = "0.7.0"
-PR = "1"
-
-do_prepsources () {
-  make clean distclean || true
-}
-addtask prepsources after do_fetch before do_unpack
-SRC_URI = "file://./"
-S = "${WORKDIR}/expedite"
-
-inherit autotools pkgconfig binconfig
-
-EXTRA_OECONF = ""
-
-FILES_${PN} = "${bindir}/* ${datadir}"

diff --git a/src/bin/engine_software_ddraw.cpp b/src/bin/engine_software_ddraw.cpp
index 8cb3bad..c5ceb95 100644 (file)
--- a/src/bin/engine_software_ddraw.cpp
+++ b/src/bin/engine_software_ddraw.cpp
@@ -223,7 +223,7 @@ engine_software_ddraw_args(const char *engine, int width, int height)
    style = GetWindowLong(window, GWL_STYLE);
    style &= ~WS_THICKFRAME;
    if (!SetWindowLong(window, GWL_STYLE, style))
-     goto unregister_class;
+     goto destroy_window;
 
    dc = GetDC(NULL);
    if (!dc)

diff --git a/src/bin/engine_software_gdi.c b/src/bin/engine_software_gdi.c
index ecb2754..92218b1 100644 (file)
--- a/src/bin/engine_software_gdi.c
+++ b/src/bin/engine_software_gdi.c
@@ -216,7 +216,7 @@ engine_software_gdi_args(const char *engine __UNUSED__, int width, int height)
                            rect.right - rect.left, rect.bottom - rect.top,
                            NULL, NULL, instance, NULL);
    if (!window)
-     goto unregister_class;
+     goto destroy_window;
 
    /* make the window non resizable */
    style = GetWindowLong(window, GWL_STYLE);

diff --git a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
index 85d9a58..3b827fa 100644 (file)
--- a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
@@ -85,9 +85,9 @@ static void _cleanup(void)
 static void _loop(double t, int f)
 {
    int i;
-   Evas_Map *m;
+   static Evas_Map *m = NULL;
    Evas_Coord x, y, w, h;
-   m = evas_map_new(4);
+   if (!m) m = evas_map_new(4);
    evas_map_smooth_set(m, 0);
    for (i = 0; i < 1; i++)
      {
@@ -103,7 +103,6 @@ static void _loop(double t, int f)
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }
-   evas_map_free(m);
    FPS_STD(NAME);
 }
 

diff --git a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
index 6c7218f..290f716 100644 (file)
--- a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
@@ -84,9 +84,9 @@ static void _cleanup(void)
 static void _loop(double t, int f)
 {
    int i;
-   Evas_Map *m;
+   static Evas_Map *m = NULL;
    Evas_Coord x, y, w, h;
-   m = evas_map_new(4);
+   if (!m) m = evas_map_new(4);
    for (i = 0; i < 1; i++)
      {
         w = 640;
@@ -101,7 +101,6 @@ static void _loop(double t, int f)
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }
-   evas_map_free(m);
    FPS_STD(NAME);
 }
 

diff --git a/src/bin/image_map_3d_1.c b/src/bin/image_map_3d_1.c
index 7b15556..d3b65b8 100644 (file)
--- a/src/bin/image_map_3d_1.c
+++ b/src/bin/image_map_3d_1.c
@@ -101,11 +101,11 @@ _cube_pos(Cube *c,
           Evas_Coord x, Evas_Coord y, Evas_Coord z,
           double dx, double dy, double dz)
 {
-   Evas_Map *m;
+   static Evas_Map *m = NULL;
    int i, j, order[6], sorted;
    Evas_Coord mz[6];
    
-   m = evas_map_new(4);
+   if (!m) m = evas_map_new(4);
    evas_map_smooth_set(m, 0);
 
    for (i = 0; i < 6; i++)
@@ -162,7 +162,6 @@ _cube_pos(Cube *c,
    evas_object_raise(c->side[order[0]].o);
    for (i = 1; i < 6; i++)
      evas_object_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
-   evas_map_free(m);
 }
 
 static void

diff --git a/src/bin/image_map_3d_2.c b/src/bin/image_map_3d_2.c
index c5fa2b9..9d10462 100644 (file)
--- a/src/bin/image_map_3d_2.c
+++ b/src/bin/image_map_3d_2.c
@@ -100,11 +100,11 @@ _cube_pos(Cube *c,
           Evas_Coord x, Evas_Coord y, Evas_Coord z,
           double dx, double dy, double dz)
 {
-   Evas_Map *m;
+   static Evas_Map *m = NULL;
    int i, j, order[6], sorted;
    Evas_Coord mz[6];
    
-   m = evas_map_new(4);
+   if (!m) m = evas_map_new(4);
 
    for (i = 0; i < 6; i++)
      {
@@ -160,7 +160,6 @@ _cube_pos(Cube *c,
    evas_object_raise(c->side[order[0]].o);
    for (i = 1; i < 6; i++)
      evas_object_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
-   evas_map_free(m);
 }
 
 static void

diff --git a/src/bin/image_map_3d_3.c b/src/bin/image_map_3d_3.c
index 54c0fc9..09ce38d 100644 (file)
--- a/src/bin/image_map_3d_3.c
+++ b/src/bin/image_map_3d_3.c
@@ -101,11 +101,11 @@ _cube_pos(Cube *c,
           Evas_Coord x, Evas_Coord y, Evas_Coord z,
           double dx, double dy, double dz)
 {
-   Evas_Map *m;
+   static Evas_Map *m = NULL;
    int i, j, order[6], sorted;
    Evas_Coord mz[6];
    
-   m = evas_map_new(4);
+   if (!m) m = evas_map_new(4);
    evas_map_smooth_set(m, 0);
 
    for (i = 0; i < 6; i++)
@@ -156,7 +156,6 @@ _cube_pos(Cube *c,
    evas_object_raise(c->side[order[0]].o);
    for (i = 1; i < 6; i++)
      evas_object_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
-   evas_map_free(m);
 }
 
 static void

diff --git a/src/bin/image_map_3d_4.c b/src/bin/image_map_3d_4.c
index 0afb349..9f54835 100644 (file)
--- a/src/bin/image_map_3d_4.c
+++ b/src/bin/image_map_3d_4.c
@@ -100,11 +100,11 @@ _cube_pos(Cube *c,
           Evas_Coord x, Evas_Coord y, Evas_Coord z,
           double dx, double dy, double dz)
 {
-   Evas_Map *m;
+   static Evas_Map *m = NULL;
    int i, j, order[6], sorted;
    Evas_Coord mz[6];
    
-   m = evas_map_new(4);
+   if (!m) m = evas_map_new(4);
 
    for (i = 0; i < 6; i++)
      {
@@ -154,7 +154,6 @@ _cube_pos(Cube *c,
    evas_object_raise(c->side[order[0]].o);
    for (i = 1; i < 6; i++)
      evas_object_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
-   evas_map_free(m);
 }
 
 static void

diff --git a/src/bin/image_map_3d_5.c b/src/bin/image_map_3d_5.c
index b2aabdd..9d5c390 100644 (file)
--- a/src/bin/image_map_3d_5.c
+++ b/src/bin/image_map_3d_5.c
@@ -101,11 +101,11 @@ _cube_pos(Cube *c,
           Evas_Coord x, Evas_Coord y, Evas_Coord z,
           double dx, double dy, double dz)
 {
-   Evas_Map *m;
+   static Evas_Map *m = NULL;
    int i, j, order[6], sorted;
    Evas_Coord mz[6];
    
-   m = evas_map_new(4);
+   if (!m) m = evas_map_new(4);
    evas_map_smooth_set(m, 0);
 
    for (i = 0; i < 6; i++)
@@ -162,7 +162,6 @@ _cube_pos(Cube *c,
    evas_object_raise(c->side[order[0]].o);
    for (i = 1; i < 6; i++)
      evas_object_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
-   evas_map_free(m);
 }
 
 static void

diff --git a/src/bin/image_map_3d_6.c b/src/bin/image_map_3d_6.c
index 96d1862..74716a2 100644 (file)
--- a/src/bin/image_map_3d_6.c
+++ b/src/bin/image_map_3d_6.c
@@ -101,11 +101,11 @@ _cube_pos(Cube *c,
           Evas_Coord x, Evas_Coord y, Evas_Coord z,
           double dx, double dy, double dz)
 {
-   Evas_Map *m;
+   Evas_Map *m = NULL;
    int i, j, order[6], sorted;
    Evas_Coord mz[6];
    
-   m = evas_map_new(4);
+   if (!m) m = evas_map_new(4);
    evas_map_smooth_set(m, 0);
 
    for (i = 0; i < 6; i++)
@@ -159,7 +159,6 @@ _cube_pos(Cube *c,
    evas_object_raise(c->side[order[0]].o);
    for (i = 1; i < 6; i++)
      evas_object_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
-   evas_map_free(m);
 }
 
 static void

diff --git a/src/bin/image_map_3d_flow.c b/src/bin/image_map_3d_flow.c
index 55ac295..80c1b0c 100644 (file)
--- a/src/bin/image_map_3d_flow.c
+++ b/src/bin/image_map_3d_flow.c
@@ -62,12 +62,12 @@ static void _cleanup(void)
 static void _loop(double t, int f)
 {
    int i;
-   Evas_Map *m;
+   static Evas_Map *m = NULL;
    Evas_Coord x, y, xx, yy, w, h, c, z;
    int center = 150;
    double ang, n;
    
-   m = evas_map_new(4);
+   if (!m) m = evas_map_new(4);
    evas_map_smooth_set(m, 0);
    
    for (i = 0; i < CNUM; i++)
@@ -180,7 +180,6 @@ static void _loop(double t, int f)
         evas_object_map_enable_set(o_reflec[i], 1);
         evas_object_map_set(o_reflec[i], m);
      }
-   evas_map_free(m);
    
    FPS_STD(NAME);
 }

diff --git a/src/bin/image_map_color_alpha_nearest_rotate.c b/src/bin/image_map_color_alpha_nearest_rotate.c
index b5566c1..a515c25 100644 (file)
--- a/src/bin/image_map_color_alpha_nearest_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_rotate.c
@@ -46,9 +46,9 @@ static void _cleanup(void)
 static void _loop(double t, int f)
 {
    int i;
-   Evas_Map *m;
+   static Evas_Map *m = NULL;
    Evas_Coord x, y, w, h;
-   m = evas_map_new(4);
+   if (!m) m = evas_map_new(4);
    evas_map_smooth_set(m, 0);
    for (i = 0; i < (OBNUM / 2); i++)
      {
@@ -71,7 +71,6 @@ static void _loop(double t, int f)
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }
-   evas_map_free(m);
    FPS_STD(NAME);
 }
 

diff --git a/src/bin/image_map_color_alpha_nearest_solid_rotate.c b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
index 2634f79..c8012dd 100644 (file)
--- a/src/bin/image_map_color_alpha_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
@@ -46,9 +46,9 @@ static void _cleanup(void)
 static void _loop(double t, int f)
 {
    int i;
-   Evas_Map *m;
+   static Evas_Map *m = NULL;
    Evas_Coord x, y, w, h;
-   m = evas_map_new(4);
+   if (!m) m = evas_map_new(4);
    evas_map_smooth_set(m, 0);
    for (i = 0; i < (OBNUM / 2); i++)
      {
@@ -71,7 +71,6 @@ static void _loop(double t, int f)
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }
-   evas_map_free(m);
    FPS_STD(NAME);
 }
 

diff --git a/src/bin/image_map_color_alpha_rotate.c b/src/bin/image_map_color_alpha_rotate.c
index 5bf479c..9b7511d 100644 (file)
--- a/src/bin/image_map_color_alpha_rotate.c
+++ b/src/bin/image_map_color_alpha_rotate.c
@@ -45,9 +45,9 @@ static void _cleanup(void)
 static void _loop(double t, int f)
 {
    int i;
-   Evas_Map *m;
+   static Evas_Map *m = NULL;
    Evas_Coord x, y, w, h;
-   m = evas_map_new(4);
+   if (!m) m = evas_map_new(4);
    for (i = 0; i < (OBNUM / 2); i++)
      {
         w = 120;
@@ -69,7 +69,6 @@ static void _loop(double t, int f)
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }
-   evas_map_free(m);
    FPS_STD(NAME);
 }
 

diff --git a/src/bin/image_map_color_alpha_solid_rotate.c b/src/bin/image_map_color_alpha_solid_rotate.c
index 223d9d7..d748b8d 100644 (file)
--- a/src/bin/image_map_color_alpha_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_solid_rotate.c
@@ -45,9 +45,9 @@ static void _cleanup(void)
 static void _loop(double t, int f)
 {
    int i;
-   Evas_Map *m;
+   static Evas_Map *m = NULL;
    Evas_Coord x, y, w, h;
-   m = evas_map_new(4);
+   if (!m) m = evas_map_new(4);
    for (i = 0; i < (OBNUM / 2); i++)
      {
         w = 120;
@@ -68,7 +68,6 @@ static void _loop(double t, int f)
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }
-   evas_map_free(m);
    FPS_STD(NAME);
 }
 

diff --git a/src/bin/image_map_color_nearest_rotate.c b/src/bin/image_map_color_nearest_rotate.c
index 8bc6024..1cfcc1f 100644 (file)
--- a/src/bin/image_map_color_nearest_rotate.c
+++ b/src/bin/image_map_color_nearest_rotate.c
@@ -46,9 +46,9 @@ static void _cleanup(void)
 static void _loop(double t, int f)
 {
    int i;
-   Evas_Map *m;
+   static Evas_Map *m = NULL;
    Evas_Coord x, y, w, h;
-   m = evas_map_new(4);
+   if (!m) m = evas_map_new(4);
    evas_map_smooth_set(m, 0);
    for (i = 0; i < (OBNUM / 2); i++)
      {
@@ -71,7 +71,6 @@ static void _loop(double t, int f)
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }
-   evas_map_free(m);
    FPS_STD(NAME);
 }
 

diff --git a/src/bin/image_map_color_nearest_solid_rotate.c b/src/bin/image_map_color_nearest_solid_rotate.c
index 3a59396..868f59c 100644 (file)
--- a/src/bin/image_map_color_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_nearest_solid_rotate.c
@@ -46,9 +46,9 @@ static void _cleanup(void)
 static void _loop(double t, int f)
 {
    int i;
-   Evas_Map *m;
+   static Evas_Map *m = NULL;
    Evas_Coord x, y, w, h;
-   m = evas_map_new(4);
+   if (!m) m = evas_map_new(4);
    evas_map_smooth_set(m, 0);
    for (i = 0; i < (OBNUM / 2); i++)
      {
@@ -71,7 +71,6 @@ static void _loop(double t, int f)
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }
-   evas_map_free(m);
    FPS_STD(NAME);
 }
 

diff --git a/src/bin/image_map_color_rotate.c b/src/bin/image_map_color_rotate.c
index 9d00172..026e456 100644 (file)
--- a/src/bin/image_map_color_rotate.c
+++ b/src/bin/image_map_color_rotate.c
@@ -45,9 +45,9 @@ static void _cleanup(void)
 static void _loop(double t, int f)
 {
    int i;
-   Evas_Map *m;
+   static Evas_Map *m = NULL;
    Evas_Coord x, y, w, h;
-   m = evas_map_new(4);
+   if (!m) m = evas_map_new(4);
    for (i = 0; i < (OBNUM / 2); i++)
      {
         w = 120;
@@ -69,7 +69,6 @@ static void _loop(double t, int f)
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }
-   evas_map_free(m);
    FPS_STD(NAME);
 }
 

diff --git a/src/bin/image_map_color_solid_rotate.c b/src/bin/image_map_color_solid_rotate.c
index ad83259..91e4a3a 100644 (file)
--- a/src/bin/image_map_color_solid_rotate.c
+++ b/src/bin/image_map_color_solid_rotate.c
@@ -45,9 +45,9 @@ static void _cleanup(void)
 static void _loop(double t, int f)
 {
    int i;
-   Evas_Map *m;
+   static Evas_Map *m = NULL;
    Evas_Coord x, y, w, h;
-   m = evas_map_new(4);
+   if (!m) m = evas_map_new(4);
    for (i = 0; i < (OBNUM / 2); i++)
      {
         w = 120;
@@ -69,7 +69,6 @@ static void _loop(double t, int f)
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }
-   evas_map_free(m);
    FPS_STD(NAME);
 }
 

diff --git a/src/bin/image_map_nearest_rotate.c b/src/bin/image_map_nearest_rotate.c
index d3ba537..aaa8ff7 100644 (file)
--- a/src/bin/image_map_nearest_rotate.c
+++ b/src/bin/image_map_nearest_rotate.c
@@ -46,9 +46,9 @@ static void _cleanup(void)
 static void _loop(double t, int f)
 {
    int i;
-   Evas_Map *m;
+   static Evas_Map *m = NULL;
    Evas_Coord x, y, w, h;
-   m = evas_map_new(4);
+   if (!m) m = evas_map_new(4);
    evas_map_smooth_set(m, 0);
    for (i = 0; i < (OBNUM / 2); i++)
      {
@@ -66,7 +66,6 @@ static void _loop(double t, int f)
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }
-   evas_map_free(m);
    FPS_STD(NAME);
 }
 

diff --git a/src/bin/image_map_nearest_solid_rotate.c b/src/bin/image_map_nearest_solid_rotate.c
index 1816886..3c2696f 100644 (file)
--- a/src/bin/image_map_nearest_solid_rotate.c
+++ b/src/bin/image_map_nearest_solid_rotate.c
@@ -46,9 +46,9 @@ static void _cleanup(void)
 static void _loop(double t, int f)
 {
    int i;
-   Evas_Map *m;
+   static Evas_Map *m = NULL;
    Evas_Coord x, y, w, h;
-   m = evas_map_new(4);
+   if (!m) m = evas_map_new(4);
    evas_map_smooth_set(m, 0);
    for (i = 0; i < (OBNUM / 2); i++)
      {
@@ -66,7 +66,6 @@ static void _loop(double t, int f)
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }
-   evas_map_free(m);
    FPS_STD(NAME);
 }
 

diff --git a/src/bin/image_map_rotate.c b/src/bin/image_map_rotate.c
index 9089f48..d84f84b 100644 (file)
--- a/src/bin/image_map_rotate.c
+++ b/src/bin/image_map_rotate.c
@@ -45,9 +45,9 @@ static void _cleanup(void)
 static void _loop(double t, int f)
 {
    int i;
-   Evas_Map *m;
+   static Evas_Map *m = NULL;
    Evas_Coord x, y, w, h;
-   m = evas_map_new(4);
+   if (!m) m = evas_map_new(4);
    for (i = 0; i < (OBNUM / 2); i++)
      {
         w = 120;
@@ -64,7 +64,6 @@ static void _loop(double t, int f)
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }
-   evas_map_free(m);
    FPS_STD(NAME);
 }
 

diff --git a/src/bin/image_map_solid_rotate.c b/src/bin/image_map_solid_rotate.c
index bdb8630..fc0b3ce 100644 (file)
--- a/src/bin/image_map_solid_rotate.c
+++ b/src/bin/image_map_solid_rotate.c
@@ -45,9 +45,9 @@ static void _cleanup(void)
 static void _loop(double t, int f)
 {
    int i;
-   Evas_Map *m;
+   static Evas_Map *m = NULL;
    Evas_Coord x, y, w, h;
-   m = evas_map_new(4);
+   if (!m) m = evas_map_new(4);
    for (i = 0; i < (OBNUM / 2); i++)
      {
         w = 120;
@@ -64,7 +64,6 @@ static void _loop(double t, int f)
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }
-   evas_map_free(m);
    FPS_STD(NAME);
 }
 

diff --git a/src/bin/image_mask_10.c b/src/bin/image_mask_10.c
index ab89b9d..721c56e 100644 (file)
--- a/src/bin/image_mask_10.c
+++ b/src/bin/image_mask_10.c
@@ -56,22 +56,21 @@ static void _cleanup(void)
 static void _loop(double t, int f)
 {
    int i;
-   Evas_Map *m;
+   static Evas_Map *m = NULL;
    Evas_Coord x, y, w, h;
+   if (!m) m = evas_map_new(4);
    for (i = 0; i < 1; i++)
      {
        w = win_w * 4;
        h = win_h * 4;
        x = (win_w / 2) - (w / 2);
        y = (win_h / 2) - (h / 2);
-        m = evas_map_new(4);
         evas_map_util_points_populate_from_geometry(m, 
                                                     -win_w, -win_h,
                                                     win_w * 4, win_h * 4, 0);
         evas_map_util_rotate(m, f, win_w / 2, win_h / 2);
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
-        evas_map_free(m);
      }
    FPS_STD(NAME);
 }

diff --git a/src/bin/image_mask_11.c b/src/bin/image_mask_11.c
index 0b0a67a..8489bc9 100644 (file)
--- a/src/bin/image_mask_11.c
+++ b/src/bin/image_mask_11.c
@@ -56,7 +56,7 @@ static void _cleanup(void)
 static void _loop(double t, int f)
 {
    int i;
-   Evas_Map *m;
+   static Evas_Map *m = NULL;
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
@@ -68,7 +68,7 @@ static void _loop(double t, int f)
        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
        evas_object_move(o_images[i], x, y);
      }
-   m = evas_map_new(4);
+   if (!m) m = evas_map_new(4);
    evas_map_util_points_populate_from_geometry(m,
                                                (win_w - 720) / 2,
                                                (win_h - 420) / 2,
@@ -76,7 +76,6 @@ static void _loop(double t, int f)
    evas_map_util_rotate(m, f, win_w / 2, win_h / 2);
    evas_object_map_enable_set(o_mask, 1);
    evas_object_map_set(o_mask, m);
-   evas_map_free(m);
    FPS_STD(NAME);
 }
 

diff --git a/src/bin/image_mask_9.c b/src/bin/image_mask_9.c
index b602ef7..f39d80e 100644 (file)
--- a/src/bin/image_mask_9.c
+++ b/src/bin/image_mask_9.c
@@ -56,7 +56,7 @@ static void _cleanup(void)
 static void _loop(double t, int f)
 {
    int i;
-   Evas_Map *m;
+   static Evas_Map *m = NULL;
    Evas_Coord x, y, w, h;
    for (i = 0; i < 1; i++)
      {
@@ -68,7 +68,7 @@ static void _loop(double t, int f)
        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (444 / 2);
        evas_object_move(o_images[i], x, y);
      }
-   m = evas_map_new(4);
+   if (!m) m = evas_map_new(4);
    
    evas_map_util_points_populate_from_geometry(m, 
                                                (win_w - 720) / 2, 
@@ -77,7 +77,6 @@ static void _loop(double t, int f)
    evas_map_util_rotate(m, f, win_w / 2, win_h / 2);
    evas_object_map_enable_set(o_mask, 1);
    evas_object_map_set(o_mask, m);
-   evas_map_free(m);
    FPS_STD(NAME);
 }
 

diff --git a/src/bin/ui.c b/src/bin/ui.c
index 3dd05a5..7e46c99 100644 (file)
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -423,7 +423,6 @@ _ui_key(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
 }
 
 static Evas_Coord down_x, down_y;
-static int down = 0;
 static int down_menu_sel = 0;
 
 static void
@@ -435,13 +434,9 @@ _ui_mouse_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNU
    if (ev->button != 1) return;
    if (menu_active)
      {
-       down_x = ev->canvas.x;
-       down_y = ev->canvas.y;
-       down++;
-       down_menu_sel = menu_sel;
-     }
-   else
-     {
+        down_x = ev->canvas.x;
+        down_y = ev->canvas.y;
+        down_menu_sel = menu_sel;
      }
 }
 
@@ -454,19 +449,18 @@ _ui_mouse_up(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
    if (ev->button != 1) return;
    if (menu_active)
      {
-       Evas_Coord dx, dy;
-
-       dx = ev->canvas.x - down_x;
-       dy = ev->canvas.y - down_y;
-       if ((((dx * dx) + (dy * dy)) < (20 * 20)) &&
-           (menu_sel == down_menu_sel))
-         _ui_select();
-       down--;
+        Evas_Coord dx, dy;
+
+        dx = ev->canvas.x - down_x;
+        dy = ev->canvas.y - down_y;
+        if ((((dx * dx) + (dy * dy)) < (20 * 20)) &&
+            (menu_sel == down_menu_sel))
+          _ui_select();
      }
    else
      {
-       evas_event_feed_key_down(evas, "Escape", "Escape", NULL, NULL, 0, NULL);
-       evas_event_feed_key_up(evas, "Escape", "Escape", NULL, NULL, 0, NULL);
+        evas_event_feed_key_down(evas, "Escape", "Escape", NULL, NULL, 0, NULL);
+        evas_event_feed_key_up(evas, "Escape", "Escape", NULL, NULL, 0, NULL);
      }
 }
 
@@ -476,17 +470,15 @@ _ui_mouse_move(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNU
    Evas_Event_Mouse_Move *ev;
 
    ev = event_info;
-   if (!down) return;
+   if (ev->buttons != 1) return;
    if (menu_active)
      {
-       menu_sel = down_menu_sel + ((ev->cur.canvas.x - down_x) / 25);
-       /* scroll */
-       if (menu_sel < 0) menu_sel = 0;
-       else if ((unsigned int)menu_sel >= eina_list_count(menu)) menu_sel = eina_list_count(menu) - 1;
-       menu_anim_sel = menu_sel;
-     }
-   else
-     {
+        menu_sel = down_menu_sel + ((ev->cur.canvas.x - down_x) / 25);
+        /* scroll */
+        if (menu_sel < 0) menu_sel = 0;
+        else if ((unsigned int)menu_sel >= eina_list_count(menu))
+          menu_sel = eina_list_count(menu) - 1;
+        menu_anim_sel = menu_sel;
      }
 }