Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common
Modified Files:
evas_image_main.c
Log Message:
notes - cedric... i think i may have found a problem here...
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_image_main.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- evas_image_main.c 3 May 2008 06:38:45 -0000 1.62
+++ evas_image_main.c 3 May 2008 08:31:26 -0000 1.63
@@ -153,16 +153,21 @@
else
siz = w * h * sizeof(DATA32);
- if (im->image.no_free)
- im->image.data = malloc(siz);
- else
+ /* FIXME: this is wrong. we seem to realloc data here that ismaked "no_free"
+ * whihc is wrong, but when we fix it, we break all sorts of stuff
+ * whihc used to work. i suspect the cache changes in evas */
+#if 1
+ im->image.data = realloc(im->image.data, siz);
+ if (im->image.data == NULL) return -1;
+#else
+ if (!im->image.no_free)
{
-// im->image.data = realloc(im->image.data, siz);
if (im->image.data) free(im->image.data);
im->image.data = malloc(siz);
+ if (im->image.data == NULL) return -1;
}
- if (im->image.data == NULL) return -1;
-
+#endif
+
#ifdef HAVE_VALGRIND
VALGRIND_MAKE_READABLE(im->image.data, siz);
#endif
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
