Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/gl_x11
Modified Files:
evas_engine.c
Log Message:
fix segv added in
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/gl_x11/evas_engine.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- evas_engine.c 17 Dec 2006 15:48:51 -0000 1.18
+++ evas_engine.c 17 Dec 2006 16:46:30 -0000 1.19
@@ -464,6 +464,7 @@
Evas_GL_Image *im;
re = (Render_Engine *)data;
+ if (!image) return 1;
im = image;
/* FIXME: can move to gl_common */
switch (im->cs.space)
@@ -483,6 +484,7 @@
Evas_GL_Image *im;
re = (Render_Engine *)data;
+ if (!image) return EVAS_COLORSPACE_ARGB8888;
im = image;
return im->cs.space;
}
@@ -754,7 +756,7 @@
eng_image_data_put(void *data, void *image, DATA32 *image_data)
{
Render_Engine *re;
- Evas_GL_Image *im;
+ Evas_GL_Image *im, *im2;
re = (Render_Engine *)data;
im = image;
@@ -768,10 +770,11 @@
w = im->im->image->w;
h = im->im->image->h;
+ im2 = eng_image_new_from_data(data, w, h, image_data,
+ eng_image_alpha_get(data, image),
+ eng_image_colorspace_get(data,
image));
evas_gl_common_image_free(im);
- return eng_image_new_from_data(data, w, h, image_data,
- eng_image_alpha_get(data, image),
- eng_image_colorspace_get(data,
image));
+ im = im2;
}
break;
case EVAS_COLORSPACE_YCBCR422P601_PL:
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
