vtorri
/
expedite
forked from enlightenment/expedite
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

expedite: don't overallocate things. 

SVN revision: 70609
This commit is contained in:
Cedric BAIL 2012-05-02 06:57:59 +00:00
parent 22b8898cfa
commit d6821d5d8b
26 changed files with 63 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,7 +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)
2012-04-26 Carsten Haitzler (The Rasterman)
1.2.0 release
2012-05-02 Cedric Bail
* Do not allocate more than once Evas_Map.

9
NEWS
View File

@ -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:

5
src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
View File

@ -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);
}

5
src/bin/image_data_ycbcr601pl_map_solid_rotate.c
View File

@ -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);
}

5
src/bin/image_map_3d_1.c
View File

@ -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

5
src/bin/image_map_3d_2.c
View File

@ -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

5
src/bin/image_map_3d_3.c
View File

@ -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

5
src/bin/image_map_3d_4.c
View File

@ -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

5
src/bin/image_map_3d_5.c
View File

@ -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

5
src/bin/image_map_3d_6.c
View File

@ -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

5
src/bin/image_map_3d_flow.c
View File

@ -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);
}

5
src/bin/image_map_color_alpha_nearest_rotate.c
View File

@ -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);
}

5
src/bin/image_map_color_alpha_nearest_solid_rotate.c
View File

@ -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);
}

5
src/bin/image_map_color_alpha_rotate.c
View File

@ -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);
}

5
src/bin/image_map_color_alpha_solid_rotate.c
View File

@ -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);
}

5
src/bin/image_map_color_nearest_rotate.c
View File

@ -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);
}

5
src/bin/image_map_color_nearest_solid_rotate.c
View File

@ -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);
}

5
src/bin/image_map_color_rotate.c
View File

@ -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);
}

5
src/bin/image_map_color_solid_rotate.c
View File

@ -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);
}

5
src/bin/image_map_nearest_rotate.c
View File

@ -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);
}

5
src/bin/image_map_nearest_solid_rotate.c
View File

@ -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);
}

5
src/bin/image_map_rotate.c
View File

@ -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);
}

5
src/bin/image_map_solid_rotate.c
View File

@ -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);
}

5
src/bin/image_mask_10.c
View File

@ -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);
}

5
src/bin/image_mask_11.c
View File

@ -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);
}

5
src/bin/image_mask_9.c
View File

@ -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);
}