summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-01-04 21:29:57 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-01-05 14:54:04 +0900
commite7ae08427034bf0a1b55ec8e6bacea6f4639e58f (patch)
tree2f45885e2aba3cecf266a62f829c492286943a16
parentf5c4cd2f7f51f739f5f69eb4c857ccbfd8d51b0a (diff)
Evas: Replace abort() by ERR
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index 24d2c06f4b..6e4c2c88fc 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -287,10 +287,10 @@ eng_image_colorspace_set(void *data, void *image, Evas_Colorspace cspace)
287 if (im->cs.space == cspace) return; 287 if (im->cs.space == cspace) return;
288 re->window_use(re->software.ob); 288 re->window_use(re->software.ob);
289 evas_gl_common_image_alloc_ensure(im); 289 evas_gl_common_image_alloc_ensure(im);
290 evas_cache_image_colorspace(&im->im->cache_entry, cspace);
291 switch (cspace) 290 switch (cspace)
292 { 291 {
293 case EVAS_COLORSPACE_ARGB8888: 292 case EVAS_COLORSPACE_ARGB8888:
293 evas_cache_image_colorspace(&im->im->cache_entry, cspace);
294 if (im->cs.data) 294 if (im->cs.data)
295 { 295 {
296 if (!im->cs.no_free) free(im->cs.data); 296 if (!im->cs.no_free) free(im->cs.data);
@@ -303,6 +303,7 @@ eng_image_colorspace_set(void *data, void *image, Evas_Colorspace cspace)
303 case EVAS_COLORSPACE_YCBCR422601_PL: 303 case EVAS_COLORSPACE_YCBCR422601_PL:
304 case EVAS_COLORSPACE_YCBCR420NV12601_PL: 304 case EVAS_COLORSPACE_YCBCR420NV12601_PL:
305 case EVAS_COLORSPACE_YCBCR420TM12601_PL: 305 case EVAS_COLORSPACE_YCBCR420TM12601_PL:
306 evas_cache_image_colorspace(&im->im->cache_entry, cspace);
306 if (im->tex) evas_gl_common_texture_free(im->tex, EINA_TRUE); 307 if (im->tex) evas_gl_common_texture_free(im->tex, EINA_TRUE);
307 im->tex = NULL; 308 im->tex = NULL;
308 if (im->cs.data) 309 if (im->cs.data)
@@ -317,8 +318,8 @@ eng_image_colorspace_set(void *data, void *image, Evas_Colorspace cspace)
317 im->cs.no_free = 0; 318 im->cs.no_free = 0;
318 break; 319 break;
319 default: 320 default:
320 abort(); 321 ERR("colorspace %d is not supported here", im->cs.space);
321 break; 322 return;
322 } 323 }
323 im->cs.space = cspace; 324 im->cs.space = cspace;
324} 325}
@@ -912,7 +913,8 @@ eng_image_data_get(void *data, void *image, int to_write, DATA32 **image_data, i
912 error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT; 913 error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
913 break; 914 break;
914 default: 915 default:
915 abort(); 916 ERR("colorspace %d is not supported here", im->cs.space);
917 error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
916 break; 918 break;
917 } 919 }
918 if (err) *err = error; 920 if (err) *err = error;
@@ -1000,7 +1002,7 @@ eng_image_data_put(void *data, void *image, DATA32 *image_data)
1000 break; 1002 break;
1001 default: 1003 default:
1002 ERR("colorspace %d is not supported here", im->cs.space); 1004 ERR("colorspace %d is not supported here", im->cs.space);
1003 return NULL; 1005 break;
1004 } 1006 }
1005 return im; 1007 return im;
1006} 1008}