From 63c01cbb2a01a09a40d22fa47454a82c8b31183f Mon Sep 17 00:00:00 2001 From: Cedric Bail Date: Thu, 21 Nov 2013 10:47:27 +0900 Subject: [PATCH] evas: reduce numbers of call to eet_init/eet_shutdown. --- src/lib/evas/canvas/evas_main.c | 8 ++++++++ src/lib/evas/common/evas_image_main.c | 6 ------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c index 101b82f..6cc8f8e 100644 --- a/src/lib/evas/canvas/evas_main.c +++ b/src/lib/evas/canvas/evas_main.c @@ -51,6 +51,10 @@ evas_init(void) eo_init(); +#ifdef BUILD_LOADER_EET + eet_init(); +#endif + evas_module_init(); if (!evas_async_events_init()) goto shutdown_module; @@ -124,6 +128,10 @@ evas_shutdown(void) evas_font_dir_cache_free(); evas_common_shutdown(); evas_module_shutdown(); + +#ifdef BUILD_LOADER_EET + eet_shutdown(); +#endif eo_shutdown(); eina_log_domain_unregister(_evas_log_dom_global); diff --git a/src/lib/evas/common/evas_image_main.c b/src/lib/evas/common/evas_image_main.c index 1492d80..75767dc 100644 --- a/src/lib/evas/common/evas_image_main.c +++ b/src/lib/evas/common/evas_image_main.c @@ -194,9 +194,6 @@ evas_common_image_init(void) reference++; //// ERR("REF++=%i", reference); -#ifdef BUILD_LOADER_EET - eet_init(); -#endif evas_common_scalecache_init(); } @@ -229,9 +226,6 @@ evas_common_image_shutdown(void) #endif } -#ifdef BUILD_LOADER_EET - eet_shutdown(); -#endif evas_common_scalecache_shutdown(); } -- 2.7.4