From 0112fdc3839dcd3e9130a17c325a0b1571ace5a0 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Fri, 14 Dec 2007 05:57:16 +0000 Subject: [PATCH] patches, caching fixes, zone dynamic creation/deletion handling, stuff. SVN revision: 33127 --- legacy/ecore/configure.in | 2 +- legacy/eet/src/lib/eet_lib.c | 3 ++- legacy/evas/src/lib/cache/evas_cache_engine_image.c | 2 +- legacy/evas/src/lib/cache/evas_cache_image.c | 3 ++- legacy/evas/src/lib/engines/common/evas_image_main.c | 3 +-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/legacy/ecore/configure.in b/legacy/ecore/configure.in index 0deef893c7..51aa0a511d 100644 --- a/legacy/ecore/configure.in +++ b/legacy/ecore/configure.in @@ -386,7 +386,7 @@ if test "x$have_ecore_x" = "xyes" -a "x$have_ecore_evas" = "xyes"; then fi dnl ecore_evas_x11_gl - want_ecore_evas_x11_gl=no + want_ecore_evas_x11_gl=yes AC_ARG_ENABLE(ecore-evas-x11-gl, AC_HELP_STRING( [--enable-ecore-evas-x11-gl], diff --git a/legacy/eet/src/lib/eet_lib.c b/legacy/eet/src/lib/eet_lib.c index 74c4bccf0d..128f554fef 100644 --- a/legacy/eet/src/lib/eet_lib.c +++ b/legacy/eet/src/lib/eet_lib.c @@ -497,7 +497,8 @@ eet_open(const char *file, Eet_File_Mode mode) else return NULL; } - else if ((mode == EET_FILE_MODE_READ) && (file_stat.st_size == 0)) + else if ((mode == EET_FILE_MODE_READ) && + (file_stat.st_size < (sizeof(int) * 3))) { return NULL; } diff --git a/legacy/evas/src/lib/cache/evas_cache_engine_image.c b/legacy/evas/src/lib/cache/evas_cache_engine_image.c index e34b877797..ffadcd1330 100644 --- a/legacy/evas/src/lib/cache/evas_cache_engine_image.c +++ b/legacy/evas/src/lib/cache/evas_cache_engine_image.c @@ -39,7 +39,7 @@ evas_cache_engine_image_init(const Evas_Cache_Engine_Image_Func *cb, Evas_Cache_ new->func = *cb; - new->limit = -1; + new->limit = 0; new->usage = 0; new->dirty = NULL; diff --git a/legacy/evas/src/lib/cache/evas_cache_image.c b/legacy/evas/src/lib/cache/evas_cache_image.c index a87c22cfcd..0ebabb559e 100644 --- a/legacy/evas/src/lib/cache/evas_cache_image.c +++ b/legacy/evas/src/lib/cache/evas_cache_image.c @@ -25,8 +25,9 @@ EAPI void evas_cache_image_set(Evas_Cache_Image *cache, int limit) { assert(cache != NULL); - + if (cache->limit == limit) return; cache->limit = limit; + evas_cache_image_flush(cache); } EAPI Evas_Cache_Image * diff --git a/legacy/evas/src/lib/engines/common/evas_image_main.c b/legacy/evas/src/lib/engines/common/evas_image_main.c index a142470f7b..7000fbe487 100644 --- a/legacy/evas/src/lib/engines/common/evas_image_main.c +++ b/legacy/evas/src/lib/engines/common/evas_image_main.c @@ -360,14 +360,13 @@ evas_common_image_set_cache(int size) if (eci != NULL) evas_cache_image_set(eci, size); } + EAPI int evas_common_image_get_cache(void) { return evas_cache_image_get(eci); } -#define STAT_GAP 2 - EAPI RGBA_Image * evas_common_load_image_from_file(const char *file, const char *key, RGBA_Image_Loadopts *lo) {