Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_object_image.c
Log Message:
work on valgrind issue... this should fix dropshadow - evas didnt allow us to
nuke the data.
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_image.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- evas_object_image.c 31 Mar 2005 11:39:55 -0000 1.23
+++ evas_object_image.c 1 Apr 2005 16:12:09 -0000 1.24
@@ -573,7 +573,6 @@
Evas_Object_Image *o;
void *p_data;
- if (!data) return;
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
return;
MAGIC_CHECK_END();
@@ -582,16 +581,28 @@
return;
MAGIC_CHECK_END();
p_data = o->engine_data;
- if (o->engine_data)
- o->engine_data =
obj->layer->evas->engine.func->image_data_put(obj->layer->evas->engine.data.output,
-
o->engine_data,
- data);
- else
- o->engine_data =
obj->layer->evas->engine.func->image_new_from_data(obj->layer->evas->engine.data.output,
-
o->cur.image.w,
-
o->cur.image.h,
+ if (data)
+ {
+ if (o->engine_data)
+ o->engine_data =
obj->layer->evas->engine.func->image_data_put(obj->layer->evas->engine.data.output,
+
o->engine_data,
data);
-
+ else
+ o->engine_data =
obj->layer->evas->engine.func->image_new_from_data(obj->layer->evas->engine.data.output,
+
o->cur.image.w,
+
o->cur.image.h,
+
data);
+ }
+ else
+ {
+ if (o->engine_data)
+
obj->layer->evas->engine.func->image_free(obj->layer->evas->engine.data.output,
+ o->engine_data);
+ o->load_error = EVAS_LOAD_ERROR_NONE;
+ o->cur.image.w = 0;
+ o->cur.image.h = 0;
+ o->engine_data = NULL;
+ }
if (o->engine_data)
o->engine_data =
obj->layer->evas->engine.func->image_alpha_set(obj->layer->evas->engine.data.output,
o->engine_data,
-------------------------------------------------------
This SF.net email is sponsored by Demarc:
A global provider of Threat Management Solutions.
Download our HomeAdmin security software for free today!
http://www.demarc.com/info/Sentarus/hamr30
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs