summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-11-19 11:02:31 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-11-19 11:02:31 +0900
commit3857b1cde06c9a9fe4391d854ddb65c24137ef34 (patch)
tree3209d58e3f436ab3457f95a71e90c8233841ddfe
parentdb4d4f8c875962e660aa0c5d7a6f6f957cc07899 (diff)
evas prepare - disable prepare for image objects for now
it has been working fine for me for days... but manmower reported a seg in T4906. so disable for now until we know more. this SHOULDNT be happening...
-rw-r--r--src/lib/evas/canvas/evas_object_image.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 4df8b1c38d..9cc7eb141d 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -118,12 +118,12 @@ evas_object_image_render_prepare(Evas_Object *eo_obj, Evas_Object_Protected_Data
118{ 118{
119 Evas_Image_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 119 Evas_Image_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
120 120
121#if 0
121 // if image data not loaded or in texture then upload 122 // if image data not loaded or in texture then upload
122 if ((o->cur->u.file) || (o->written) || (o->cur->frame != 0)) 123 if ((o->cur->u.file) || (o->written) || (o->cur->frame != 0))
123 { 124 {
124 if (o->engine_data) ENFN->image_prepare(ENDT, o->engine_data); 125 if (o->engine_data) ENFN->image_prepare(ENDT, o->engine_data);
125 } 126 }
126#if 0
127 if ( 127 if (
128 ((o->cur->border.l != 0) || (o->cur->border.r != 0) || 128 ((o->cur->border.l != 0) || (o->cur->border.r != 0) ||
129 (o->cur->border.t != 0) || (o->cur->border.b != 0)) && 129 (o->cur->border.t != 0) || (o->cur->border.b != 0)) &&