orbea
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dynamic texture path may have a segv issue... right jy? :) this should 

fix it. try this patch. yay!



SVN revision: 74840
This commit is contained in:
Carsten Haitzler 2012-08-03 10:42:24 +00:00
parent 49caa43011
commit 6c079bcba6
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
legacy/evas/src/modules/engines/gl_x11/evas_engine.c
View File

@ -2659,8 +2659,6 @@ eng_image_data_put(void *data, void *image, DATA32 *image_data)
&& (im->tex->pt->dyn.data) && (im->tex->pt->dyn.data)
&& (im->cs.space == EVAS_COLORSPACE_ARGB8888)) && (im->cs.space == EVAS_COLORSPACE_ARGB8888))
{ {
int w, h;
if (im->tex->pt->dyn.data == image_data) if (im->tex->pt->dyn.data == image_data)
{ {
if (im->tex->pt->dyn.checked_out > 0) if (im->tex->pt->dyn.checked_out > 0)
@ -2674,10 +2672,7 @@ eng_image_data_put(void *data, void *image, DATA32 *image_data)
return image; return image;
} }
im2 = eng_image_new_from_data(data, im->w, im->h, image_data,
w = im->im->cache_entry.w;
h = im->im->cache_entry.h;
im2 = eng_image_new_from_data(data, w, h, image_data,
eng_image_alpha_get(data, image), eng_image_alpha_get(data, image),
eng_image_colorspace_get(data, image)); eng_image_colorspace_get(data, image));
if (!im2) return im; if (!im2) return im;
@ -2689,13 +2684,9 @@ eng_image_data_put(void *data, void *image, DATA32 *image_data)
switch (im->cs.space) switch (im->cs.space)
{ {
case EVAS_COLORSPACE_ARGB8888: case EVAS_COLORSPACE_ARGB8888:
if (image_data != im->im->image.data) if ((!im->im) || (image_data != im->im->image.data))
{ {
int w, h; im2 = eng_image_new_from_data(data, im->w, im->h, image_data,
w = im->im->cache_entry.w;
h = im->im->cache_entry.h;
im2 = eng_image_new_from_data(data, w, h, image_data,
eng_image_alpha_get(data, image), eng_image_alpha_get(data, image),
eng_image_colorspace_get(data, image)); eng_image_colorspace_get(data, image));
if (!im2) return im; if (!im2) return im;