summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-09-20 09:16:57 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-09-20 09:16:57 +0000
commit15fbdbbcf05d194b34695b95b137eab93d861b2b (patch)
treec6e07deb0688cfb617b0f505b05c9111ed05573e /legacy
parent2dc64f6639eb6c8e112b96b8dd8bd119df5d3b28 (diff)
fix native surface null set crash bug.
SVN revision: 76898
Diffstat (limited to '')
-rw-r--r--legacy/evas/ChangeLog5
-rw-r--r--legacy/evas/NEWS1
-rw-r--r--legacy/evas/src/modules/engines/gl_x11/evas_engine.c4
3 files changed, 8 insertions, 2 deletions
diff --git a/legacy/evas/ChangeLog b/legacy/evas/ChangeLog
index f05479c59e..5d7d8b4266 100644
--- a/legacy/evas/ChangeLog
+++ b/legacy/evas/ChangeLog
@@ -1044,3 +1044,8 @@
1044 1044
1045 * Add evas_device API for being able to register devices, set 1045 * Add evas_device API for being able to register devices, set
1046 their names, descriptions, classes, parents, sources etc. etc. 1046 their names, descriptions, classes, parents, sources etc. etc.
1047
10482012-09-20 Carsten Haitzler (The Rasterman)
1049
1050 * Fix native surface crash when setting to null in some
1051 situations.
diff --git a/legacy/evas/NEWS b/legacy/evas/NEWS
index 489617dc53..4ad42c64ca 100644
--- a/legacy/evas/NEWS
+++ b/legacy/evas/NEWS
@@ -20,6 +20,7 @@ Fixes:
20 * Fix EGL/GLES dest alpha rendering bug (no rendering). 20 * Fix EGL/GLES dest alpha rendering bug (no rendering).
21 * Fix evas_object_image_alpha_set when image data not loaded yet. 21 * Fix evas_object_image_alpha_set when image data not loaded yet.
22 * Fix map surface leak. 22 * Fix map surface leak.
23 * Fix native surface set to null crash bug in gl engine.
23 24
24Evas 1.7.0 25Evas 1.7.0
25 26
diff --git a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
index f41e6a239d..9c6b731e70 100644
--- a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
+++ b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
@@ -2035,7 +2035,7 @@ eng_image_native_set(void *data, void *image, void *native)
2035 2035
2036 if (!im) 2036 if (!im)
2037 { 2037 {
2038 if ((!ns) && (ns->type == EVAS_NATIVE_SURFACE_OPENGL)) 2038 if ((ns) && (ns->type == EVAS_NATIVE_SURFACE_OPENGL))
2039 { 2039 {
2040 im = evas_gl_common_image_new_from_data(re->win->gl_context, 2040 im = evas_gl_common_image_new_from_data(re->win->gl_context,
2041 ns->data.opengl.w, 2041 ns->data.opengl.w,
@@ -2044,7 +2044,7 @@ eng_image_native_set(void *data, void *image, void *native)
2044 EVAS_COLORSPACE_ARGB8888); 2044 EVAS_COLORSPACE_ARGB8888);
2045 } 2045 }
2046 else 2046 else
2047 return NULL; 2047 return NULL;
2048 } 2048 }
2049 2049
2050 if (ns) 2050 if (ns)