Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/xrender_x11
Modified Files:
evas_engine.c evas_engine_gradient.c evas_engine_image.c
Log Message:
cedric's sdl patch.
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/xrender_x11/evas_engine.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- evas_engine.c 17 Jun 2007 02:56:59 -0000 1.19
+++ evas_engine.c 16 Jul 2007 07:25:34 -0000 1.20
@@ -560,14 +560,14 @@
im->cs.data = NULL;
im->cs.no_free = 0;
}
- if (im->im) evas_common_image_unref(im->im);
+ if (im->im) evas_cache_image_drop(im->im);
im->im = NULL;
break;
case EVAS_COLORSPACE_YCBCR422P601_PL:
case EVAS_COLORSPACE_YCBCR422P709_PL:
if ((im->free_data) && (im->data)) free(im->data);
im->data = NULL;
- if (im->im) evas_common_image_unref(im->im);
+ if (im->im) evas_cache_image_drop(im->im);
im->im = NULL;
if (im->cs.data)
{
===================================================================
RCS file:
/cvs/e/e17/libs/evas/src/modules/engines/xrender_x11/evas_engine_gradient.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- evas_engine_gradient.c 28 Dec 2006 12:47:33 -0000 1.6
+++ evas_engine_gradient.c 16 Jul 2007 07:25:34 -0000 1.7
@@ -170,7 +170,7 @@
im->image = evas_common_image_surface_new(im);
if (!im->image)
{
- evas_common_image_free(im);
+ evas_common_image_delete(im);
_xr_render_surface_free(gr->surface);
gr->surface = NULL;
return;
@@ -178,7 +178,7 @@
xim = _xr_image_new(gr->xinf, w, h, gr->surface->depth);
if (!xim)
{
- evas_common_image_free(im);
+ evas_common_image_delete(im);
_xr_render_surface_free(gr->surface);
gr->surface = NULL;
return;
@@ -204,7 +204,7 @@
}
}
_xr_image_put(xim, gr->surface->draw, 0, 0, w, h);
- evas_common_image_free(im);
+ evas_common_image_delete(im);
dc->render_op = op;
dc->clip.use = cuse;
}
===================================================================
RCS file:
/cvs/e/e17/libs/evas/src/modules/engines/xrender_x11/evas_engine_image.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- evas_engine_image.c 5 Apr 2007 15:44:28 -0000 1.12
+++ evas_engine_image.c 16 Jul 2007 07:25:34 -0000 1.13
@@ -235,7 +235,7 @@
if (im->file) evas_stringshare_del(im->file);
if (im->key) evas_stringshare_del(im->key);
if (im->fkey) free(im->fkey);
- if (im->im) evas_common_image_unref(im->im);
+ if (im->im) evas_cache_image_drop(im->im);
if ((im->data) && (im->dirty)) __xre_image_dirty_hash_del(im);
if ((im->free_data) && (im->data)) free(im->data);
if (im->surface) _xr_render_surface_free(im->surface);
@@ -334,7 +334,7 @@
}
else if (im->im)
{
- evas_common_image_unref(im->im);
+ evas_cache_image_drop(im->im);
im->im = NULL;
if (im->free_data)
{
@@ -360,7 +360,7 @@
}
if (im->im)
{
- evas_common_image_unref(im->im);
+ evas_cache_image_drop(im->im);
im->im = NULL;
}
if (!im->cs.no_free)
@@ -421,7 +421,7 @@
if (im->im)
{
if (data == im->im->image->data) return;
- evas_common_image_unref(im->im);
+ evas_cache_image_drop(im->im);
im->im = NULL;
}
if (im->cs.data == data) return;
@@ -636,7 +636,7 @@
im->w + 2, 1);
if ((im->im) && (!im->dirty))
{
- evas_common_image_unref(im->im);
+ evas_cache_image_drop(im->im);
im->im = NULL;
}
if (tdata) free(tdata);
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
