Fix compilation - use eo_unref and buffer map

Remove eo api usage for TEXT and LINE objects.
This is a very quickly made patch, in order to test. Expedite
tests might need to be fixed up a little bit more if we use eo_halt.

Running expedite spews out TONS of errors.
This commit is contained in:
Jean-Philippe Andre 2016-05-26 18:29:05 +09:00
parent 9a98d6376b
commit 74007f65bc
114 changed files with 229 additions and 212 deletions

View File

@ -49,7 +49,7 @@ _setup(void)
static void
_cleanup(void)
{
eo_del(o_text);
eo_unref(o_text);
o_text = NULL;
}

View File

@ -36,7 +36,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -37,7 +37,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -42,7 +42,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -40,7 +40,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -43,7 +43,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < MANYNUM; i++) eo_del(o_images[i]);
for (i = 0; i < MANYNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -36,7 +36,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -36,7 +36,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -36,7 +36,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -36,7 +36,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -50,7 +50,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -53,7 +53,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -53,7 +53,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -53,7 +53,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -50,7 +50,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -53,7 +53,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -53,7 +53,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -53,7 +53,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -50,7 +50,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -53,7 +53,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -53,7 +53,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -53,7 +53,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -36,7 +36,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -36,7 +36,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -36,7 +36,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -36,7 +36,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -36,7 +36,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -42,7 +42,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -41,7 +41,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -27,7 +27,7 @@ static void _setup(void)
o_images[i] = o;
efl_file_set(o, build_path("bar.png"), NULL);
efl_image_border_set(o, 6, 6, 6, 6);
efl_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID);
efl_image_border_center_fill_set(o, EFL_GFX_BORDER_FILL_MODE_SOLID);
efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
@ -37,7 +37,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -29,7 +29,7 @@ static void _setup(void)
efl_gfx_fill_set(o, 0, 0, 120, 160);
efl_gfx_size_set(o, 120, 160);
efl_image_border_set(o, 43, 48, 48, 83);
efl_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID);
efl_image_border_center_fill_set(o, EFL_GFX_BORDER_FILL_MODE_SOLID);
efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
@ -39,7 +39,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -37,7 +37,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -37,7 +37,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -43,7 +43,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < 2; i++) eo_del(o_images[i]);
for (i = 0; i < 2; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -44,7 +44,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < 1; i++) eo_del(o_images[i]);
for (i = 0; i < 1; i++) eo_unref(o_images[i]);
}
/* loop - do things */
@ -55,6 +55,7 @@ static void _loop(double t, int f)
for (i = 0; i < 1; i++)
{
unsigned int *data, *p;
int length;
w = 640;
h = 480;
@ -63,7 +64,15 @@ static void _loop(double t, int f)
efl_gfx_position_set(o_images[i], x, y);
efl_gfx_size_set(o_images[i], w, h);
efl_gfx_fill_set(o_images[i], 0, 0, w, h);
data = efl_gfx_buffer_get(o_images[i], 1, &w, &h, &st, NULL);
data = efl_gfx_buffer_map(o_images[i], &length,
EFL_GFX_BUFFER_ACCESS_MODE_WRITE,
0, 0, 0, 0, EFL_GFX_COLORSPACE_ARGB8888,
&st);
if (!data)
{
fprintf(stderr, "ERROR: Failed to map image!\n");
continue;
}
st = st >> 2;
p = data;
for (y = 0; y < h; y++)
@ -75,7 +84,7 @@ static void _loop(double t, int f)
}
p += (st - w);
}
efl_gfx_buffer_set(o_images[i], data, w, h, st << 2, EFL_GFX_COLORSPACE_ARGB8888);
efl_gfx_buffer_unmap(o_images[i], data, length);
efl_gfx_buffer_update_add(o_images[i], 0, 0, w, h);
}
FPS_STD(NAME);

View File

@ -44,7 +44,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < 1; i++) eo_del(o_images[i]);
for (i = 0; i < 1; i++) eo_unref(o_images[i]);
}
/* loop - do things */
@ -55,7 +55,7 @@ static void _loop(double t, int f)
for (i = 0; i < 1; i++)
{
unsigned int *data, *p;
int a, r, g, b;
int a, r, g, b, length;
w = 640;
h = 480;
@ -64,7 +64,15 @@ static void _loop(double t, int f)
efl_gfx_position_set(o_images[i], x, y);
efl_gfx_size_set(o_images[i], w, h);
efl_gfx_fill_set(o_images[i], 0, 0, w, h);
data = efl_gfx_buffer_get(o_images[i], 1, &w, &h, &st, NULL);
data = efl_gfx_buffer_map(o_images[i], &length,
EFL_GFX_BUFFER_ACCESS_MODE_WRITE,
0, 0, 0, 0, EFL_GFX_COLORSPACE_ARGB8888,
&st);
if (!data)
{
fprintf(stderr, "ERROR: Failed to map image!\n");
continue;
}
st = st >> 2;
p = data;
for (y = 0; y < h; y++)
@ -87,7 +95,7 @@ static void _loop(double t, int f)
}
p += (st - w);
}
efl_gfx_buffer_set(o_images[i], data, w, h, st << 2, EFL_GFX_COLORSPACE_ARGB8888);
efl_gfx_buffer_unmap(o_images[i], data, length);
efl_gfx_buffer_update_add(o_images[i], 0, 0, w, h);
}
FPS_STD(NAME);

View File

@ -27,8 +27,6 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
unsigned int length;
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
@ -79,7 +77,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < 1; i++) eo_del(o_images[i]);
for (i = 0; i < 1; i++) eo_unref(o_images[i]);
// FIXME: the object is not destroyed anymore so we can't free the data
/* free(yp); */
/* free(up); */

View File

@ -27,8 +27,6 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
unsigned int length;
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
@ -65,7 +63,10 @@ static void _setup(void)
*lp = vp + (y * 320);
lp++;
}
efl_gfx_buffer_set(o_images[i], data, 640, 480, 640 * sizeof (int), EVAS_COLORSPACE_YCBCR422P601_PL);
efl_gfx_buffer_data_set(o_images[i], data, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL);
free(yp);
free(up);
free(vp);
}
done = 0;
}
@ -74,7 +75,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < 1; i++) eo_del(o_images[i]);
for (i = 0; i < 1; i++) eo_unref(o_images[i]);
/* free(yp); */
/* free(up); */
/* free(vp); */

View File

@ -27,8 +27,6 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
unsigned int length;
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
@ -64,7 +62,10 @@ static void _setup(void)
*lp = vp + (y * 320);
lp++;
}
efl_gfx_buffer_set(o_images[i], data, 640, 480, 640 * sizeof (int), EVAS_COLORSPACE_YCBCR422P601_PL);
efl_gfx_buffer_data_set(o_images[i], data, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL);
free(yp);
free(up);
free(vp);
}
done = 0;
}
@ -73,7 +74,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < 1; i++) eo_del(o_images[i]);
for (i = 0; i < 1; i++) eo_unref(o_images[i]);
/* free(yp); */
/* free(up); */
/* free(vp); */

View File

@ -27,8 +27,6 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
unsigned int length;
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
@ -64,8 +62,11 @@ static void _setup(void)
*lp = vp + (y * 320);
lp++;
}
efl_gfx_buffer_set(o_images[i], data, 640, 480, 640 * sizeof (int), EVAS_COLORSPACE_YCBCR422P601_PL);
efl_gfx_buffer_data_set(o_images[i], data, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL);
efl_gfx_buffer_update_add(o_images[i], 0, 0, 320, 480);
free(yp);
free(up);
free(vp);
}
done = 0;
}
@ -74,7 +75,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < 1; i++) eo_del(o_images[i]);
for (i = 0; i < 1; i++) eo_unref(o_images[i]);
/* free(yp); */
/* free(up); */
/* free(vp); */
@ -88,7 +89,6 @@ static void _loop(double t, int f)
for (i = 0; i < 1; i++)
{
unsigned char **data, **lp;
int stride;
w = 640;
h = 480;

View File

@ -171,7 +171,7 @@ _cube_free(Cube *c)
{
int i;
for (i = 0; i < 6; i++) eo_del(c->side[i].o);
for (i = 0; i < 6; i++) eo_unref(c->side[i].o);
free(c);
}

View File

@ -169,7 +169,7 @@ _cube_free(Cube *c)
{
int i;
for (i = 0; i < 6; i++) eo_del(c->side[i].o);
for (i = 0; i < 6; i++) eo_unref(c->side[i].o);
free(c);
}

View File

@ -163,7 +163,7 @@ _cube_free(Cube *c)
{
int i;
for (i = 0; i < 6; i++) eo_del(c->side[i].o);
for (i = 0; i < 6; i++) eo_unref(c->side[i].o);
free(c);
}

View File

@ -161,7 +161,7 @@ _cube_free(Cube *c)
{
int i;
for (i = 0; i < 6; i++) eo_del(c->side[i].o);
for (i = 0; i < 6; i++) eo_unref(c->side[i].o);
free(c);
}

View File

@ -171,7 +171,7 @@ _cube_free(Cube *c)
{
int i;
for (i = 0; i < 6; i++) eo_del(c->side[i].o);
for (i = 0; i < 6; i++) eo_unref(c->side[i].o);
free(c);
}

View File

@ -168,7 +168,7 @@ _cube_free(Cube *c)
{
int i;
for (i = 0; i < 6; i++) eo_del(c->side[i].o);
for (i = 0; i < 6; i++) eo_unref(c->side[i].o);
free(c);
}

View File

@ -56,8 +56,8 @@ static void _cleanup(void)
int i;
for (i = 0; i < CNUM; i++)
{
eo_del(o_images[i]);
eo_del(o_reflec[i]);
eo_unref(o_images[i]);
eo_unref(o_reflec[i]);
}
}

View File

@ -39,7 +39,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -39,7 +39,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -38,7 +38,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -38,7 +38,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -39,7 +39,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -39,7 +39,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -38,7 +38,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -38,7 +38,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -39,7 +39,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -39,7 +39,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -38,7 +38,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -38,7 +38,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -46,7 +46,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -48,8 +48,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < 1; i++) eo_del(o_images[i]);
eo_del(o_mask);
for (i = 0; i < 1; i++) eo_unref(o_images[i]);
eo_unref(o_mask);
}
/* loop - do things */

View File

@ -48,8 +48,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
eo_del(o_mask);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
eo_unref(o_mask);
}
/* loop - do things */

View File

@ -49,8 +49,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
eo_del(o_mask);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
eo_unref(o_mask);
}
/* loop - do things */

View File

@ -49,8 +49,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
eo_del(o_mask);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
eo_unref(o_mask);
}
/* loop - do things */

View File

@ -46,7 +46,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -46,7 +46,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
}
/* loop - do things */

View File

@ -48,8 +48,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
eo_del(o_mask);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
eo_unref(o_mask);
}
/* loop - do things */

View File

@ -48,8 +48,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
eo_del(o_mask);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
eo_unref(o_mask);
}
/* loop - do things */

View File

@ -48,8 +48,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
eo_del(o_mask);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
eo_unref(o_mask);
}
/* loop - do things */

View File

@ -48,8 +48,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
eo_del(o_mask);
for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
eo_unref(o_mask);
}
/* loop - do things */

View File

@ -48,8 +48,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < 1; i++) eo_del(o_images[i]);
eo_del(o_mask);
for (i = 0; i < 1; i++) eo_unref(o_images[i]);
eo_unref(o_mask);
}
/* loop - do things */

View File

@ -48,8 +48,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
for (i = 0; i < 1; i++) eo_del(o_images[i]);
eo_del(o_mask);
for (i = 0; i < 1; i++) eo_unref(o_images[i]);
eo_unref(o_mask);