summaryrefslogtreecommitdiff
path: root/src/lib/evas/common/evas_image_load.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2013-09-27 14:46:48 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2013-10-28 15:47:15 +0900
commit9bb52372bd1a8c72e8e47cc37b499769c959318a (patch)
tree0709d867bd3d6c6f46796684494f3b95d76f89ba /src/lib/evas/common/evas_image_load.c
parentf18b71d5155e50ae1f494abe11813ac292e53e1d (diff)
evas/cserve2: Fix animated Gifs support with cs2
cserve2 does not support animated Gifs, as the animated icon logic doesn't match cserve2 logic. Also, there is probably no need to cache these into shared buffers anyways :) Solution: fallback to normal cache (and delete current entry in the client)
Diffstat (limited to 'src/lib/evas/common/evas_image_load.c')
-rw-r--r--src/lib/evas/common/evas_image_load.c35
1 files changed, 5 insertions, 30 deletions
diff --git a/src/lib/evas/common/evas_image_load.c b/src/lib/evas/common/evas_image_load.c
index c945442be5..174f1b0e48 100644
--- a/src/lib/evas/common/evas_image_load.c
+++ b/src/lib/evas/common/evas_image_load.c
@@ -243,18 +243,10 @@ evas_common_load_rgba_image_module_from_file(Image_Entry *ie)
243 struct evas_image_foreach_loader_data fdata; 243 struct evas_image_foreach_loader_data fdata;
244 244
245#ifdef EVAS_CSERVE2 245#ifdef EVAS_CSERVE2
246 if (evas_cserve2_use_get()) 246 if (evas_cserve2_use_get() && evas_cache2_image_cached(ie))
247 { 247 CRIT("This function shouldn't be called anymore!");
248 ERR("This function shouldn't be called anymore!");
249 // DBG("try cserve2 '%s' '%s'", ie->file, ie->key ? ie->key : "");
250 // if (evas_cserve2_image_load(ie, ie->file, ie->key, &(ie->load_opts)))
251 // {
252 // DBG("try cserve2 '%s' '%s' loaded!",
253 // ie->file, ie->key ? ie->key : "");
254 // return EVAS_LOAD_ERROR_NONE;
255 // }
256 }
257#endif 248#endif
249
258 if (ie->f) 250 if (ie->f)
259 { 251 {
260 len = strlen(eina_file_filename_get(ie->f)); 252 len = strlen(eina_file_filename_get(ie->f));
@@ -368,25 +360,8 @@ evas_common_load_rgba_image_data_from_file(Image_Entry *ie)
368 if ((ie->flags.loaded) && (!ie->animated.animated)) return EVAS_LOAD_ERROR_GENERIC; 360 if ((ie->flags.loaded) && (!ie->animated.animated)) return EVAS_LOAD_ERROR_GENERIC;
369 361
370#ifdef EVAS_CSERVE2 362#ifdef EVAS_CSERVE2
371 if (ie->data1) 363 if (evas_cserve2_use_get() && evas_cache2_image_cached(ie))
372 { 364 CRIT("This function shouldn't be called anymore!");
373 ERR("This function shouldn't be called anymore!");
374 // DBG("try cserve2 image data '%s' '%s'",
375 // ie->file, ie->key ? ie->key : "");
376 // if (evas_cserve2_image_data_load(ie))
377 // {
378 // RGBA_Image *im = (RGBA_Image *)ie;
379 // im->image.data = evas_cserve2_image_data_get(ie);
380 // DBG("try cserve2 image data '%s' '%s' loaded!",
381 // ie->file, ie->key ? ie->key : "");
382 // if (im->image.data)
383 // {
384 // im->image.no_free = 1;
385 // return EVAS_LOAD_ERROR_NONE;
386 // }
387 // }
388 // return EVAS_LOAD_ERROR_GENERIC;
389 }
390#endif 365#endif
391 366
392 if (!ie->info.module) return EVAS_LOAD_ERROR_GENERIC; 367 if (!ie->info.module) return EVAS_LOAD_ERROR_GENERIC;