[Pkg-e-commits] [SCM] Enlightenment DR17 advanced canvas library branch, upstream-vcs, updated. 069f3cc6c93f253bffbc90289fe21d868f745bb6
doursse
doursse at alioth.debian.org
Sat Jun 7 18:24:18 UTC 2008
The following commit has been merged in the upstream-vcs branch:
commit b6f4b7f8baf946dc1ccd7646b922ff0626239bd7
Author: doursse <doursse>
Date: Sat May 24 18:26:51 2008 +0000
fix compilation with a c++ compiler, add EAPI in front of all cache function declarations
diff --git a/src/lib/cache/evas_cache_engine_image.c b/src/lib/cache/evas_cache_engine_image.c
index d5a8897..d33a207 100644
--- a/src/lib/cache/evas_cache_engine_image.c
+++ b/src/lib/cache/evas_cache_engine_image.c
@@ -130,9 +130,9 @@ _evas_cache_engine_image_dealloc(Evas_Cache_Engine_Image *cache, Engine_Image_En
cache->func.destructor(eim);
if (im) evas_cache_image_drop(im);
- if (cache->func.delete)
+ if (cache->func.dealloc)
{
- cache->func.delete(eim);
+ cache->func.dealloc(eim);
}
else
{
diff --git a/src/lib/cache/evas_cache_image.c b/src/lib/cache/evas_cache_image.c
index 70ff14b..3c9a82a 100644
--- a/src/lib/cache/evas_cache_image.c
+++ b/src/lib/cache/evas_cache_image.c
@@ -144,7 +144,7 @@ _evas_cache_image_entry_delete(Evas_Cache_Image *cache, Image_Entry *ie)
FREESTRC(ie->key);
cache->func.surface_delete(ie);
- cache->func.delete(ie);
+ cache->func.dealloc(ie);
}
static Image_Entry *
diff --git a/src/lib/include/evas_common.h b/src/lib/include/evas_common.h
index cf19140..fe7a0d9 100644
--- a/src/lib/include/evas_common.h
+++ b/src/lib/include/evas_common.h
@@ -743,7 +743,7 @@ struct _Convert_Pal
struct _Evas_Cache_Image_Func
{
Image_Entry *(*alloc)(void);
- void (*delete)(Image_Entry *im);
+ void (*dealloc)(Image_Entry *im);
int (*surface_alloc)(Image_Entry *im, int w, int h);
void (*surface_delete)(Image_Entry *im);
@@ -794,7 +794,7 @@ struct _Evas_Cache_Engine_Image_Func
char* (*key)(Image_Entry *im, const char *file, const char *key, RGBA_Image_Loadopts *lo, int *error);
Engine_Image_Entry* (*alloc)(void);
- void (*delete)(Engine_Image_Entry *eim);
+ void (*dealloc)(Engine_Image_Entry *eim);
int (*constructor)(Engine_Image_Entry *eim, void* data);
void (*destructor)(Engine_Image_Entry *eim);
@@ -1280,48 +1280,48 @@ void evas_stringshare_init(void);
void evas_stringshare_shutdown(void);
/****/
-Evas_Cache_Image* evas_cache_image_init(const Evas_Cache_Image_Func *cb);
-void evas_cache_image_shutdown(Evas_Cache_Image *cache);
-Image_Entry* evas_cache_image_request(Evas_Cache_Image *cache, const char *file, const char *key, RGBA_Image_Loadopts *lo, int *error);
-void evas_cache_image_drop(Image_Entry *im);
-void evas_cache_image_data_not_needed(Image_Entry *im);
-int evas_cache_image_flush(Evas_Cache_Image *cache);
-
-int evas_cache_image_usage_get(Evas_Cache_Image *cache);
-int evas_cache_image_get(Evas_Cache_Image *cache);
-void evas_cache_image_set(Evas_Cache_Image *cache, int size);
-
-Image_Entry* evas_cache_image_alone(Image_Entry *im);
-Image_Entry* evas_cache_image_dirty(Image_Entry *im, int x, int y, int w, int h);
-void evas_cache_image_load_data(Image_Entry *im);
-void evas_cache_image_surface_alloc(Image_Entry *im, int w, int h);
-Image_Entry* evas_cache_image_copied_data(Evas_Cache_Image *cache, int w, int h, DATA32 *image_data, int alpha, int cspace);
-Image_Entry* evas_cache_image_data(Evas_Cache_Image *cache, int w, int h, DATA32 *image_data, int alpha, int cspace);
-void evas_cache_image_colorspace(Image_Entry *im, int cspace);
-Image_Entry* evas_cache_image_empty(Evas_Cache_Image *cache);
-Image_Entry* evas_cache_image_size_set(Image_Entry *im, int w, int h);
-
-Evas_Cache_Engine_Image* evas_cache_engine_image_init(const Evas_Cache_Engine_Image_Func *cb, Evas_Cache_Image *parent);
-void evas_cache_engine_image_shutdown(Evas_Cache_Engine_Image *cache);
-
-void evas_cache_engine_image_shutdown(Evas_Cache_Engine_Image *cache);
-int evas_cache_engine_image_usage_get(Evas_Cache_Engine_Image *cache);
-int evas_cache_engine_image_get(Evas_Cache_Engine_Image *cache);
-void evas_cache_engine_image_set(Evas_Cache_Engine_Image *cache, int limit);
-
-Engine_Image_Entry* evas_cache_engine_image_request(Evas_Cache_Engine_Image *cache, const char *file, const char *key,
+EAPI Evas_Cache_Image* evas_cache_image_init(const Evas_Cache_Image_Func *cb);
+EAPI void evas_cache_image_shutdown(Evas_Cache_Image *cache);
+EAPI Image_Entry* evas_cache_image_request(Evas_Cache_Image *cache, const char *file, const char *key, RGBA_Image_Loadopts *lo, int *error);
+EAPI void evas_cache_image_drop(Image_Entry *im);
+EAPI void evas_cache_image_data_not_needed(Image_Entry *im);
+EAPI int evas_cache_image_flush(Evas_Cache_Image *cache);
+
+EAPI int evas_cache_image_usage_get(Evas_Cache_Image *cache);
+EAPI int evas_cache_image_get(Evas_Cache_Image *cache);
+EAPI void evas_cache_image_set(Evas_Cache_Image *cache, int size);
+
+EAPI Image_Entry* evas_cache_image_alone(Image_Entry *im);
+EAPI Image_Entry* evas_cache_image_dirty(Image_Entry *im, int x, int y, int w, int h);
+EAPI void evas_cache_image_load_data(Image_Entry *im);
+EAPI void evas_cache_image_surface_alloc(Image_Entry *im, int w, int h);
+EAPI Image_Entry* evas_cache_image_copied_data(Evas_Cache_Image *cache, int w, int h, DATA32 *image_data, int alpha, int cspace);
+EAPI Image_Entry* evas_cache_image_data(Evas_Cache_Image *cache, int w, int h, DATA32 *image_data, int alpha, int cspace);
+EAPI void evas_cache_image_colorspace(Image_Entry *im, int cspace);
+EAPI Image_Entry* evas_cache_image_empty(Evas_Cache_Image *cache);
+EAPI Image_Entry* evas_cache_image_size_set(Image_Entry *im, int w, int h);
+
+EAPI Evas_Cache_Engine_Image* evas_cache_engine_image_init(const Evas_Cache_Engine_Image_Func *cb, Evas_Cache_Image *parent);
+EAPI void evas_cache_engine_image_shutdown(Evas_Cache_Engine_Image *cache);
+
+EAPI void evas_cache_engine_image_shutdown(Evas_Cache_Engine_Image *cache);
+EAPI int evas_cache_engine_image_usage_get(Evas_Cache_Engine_Image *cache);
+EAPI int evas_cache_engine_image_get(Evas_Cache_Engine_Image *cache);
+EAPI void evas_cache_engine_image_set(Evas_Cache_Engine_Image *cache, int limit);
+
+EAPI Engine_Image_Entry* evas_cache_engine_image_request(Evas_Cache_Engine_Image *cache, const char *file, const char *key,
RGBA_Image_Loadopts *lo, void *engine_data, int *error);
-void evas_cache_engine_parent_not_needed(Engine_Image_Entry *eim);
-Engine_Image_Entry* evas_cache_engine_image_engine(Evas_Cache_Engine_Image *cache, void *engine_data);
-void evas_cache_engine_image_drop(Engine_Image_Entry *eim);
-Engine_Image_Entry* evas_cache_engine_image_alone(Engine_Image_Entry *eim, void *data);
-Engine_Image_Entry* evas_cache_engine_image_dirty(Engine_Image_Entry *eim, int x, int y, int w, int h);
-Engine_Image_Entry* evas_cache_engine_image_copied_data(Evas_Cache_Engine_Image *cache, int w, int h, DATA32 *image_data, int alpha, int cspace, void *engine_data);
-Engine_Image_Entry* evas_cache_engine_image_data(Evas_Cache_Engine_Image *cache, int w, int h, DATA32 *image_data, int alpha, int cspace, void *engine_data);
-void evas_cache_engine_image_colorspace(Engine_Image_Entry *eim, int cspace, void *engine_data);
-Engine_Image_Entry* evas_cache_engine_image_size_set(Engine_Image_Entry *eim, int w, int h);
-
-void evas_cache_engine_image_load_data(Engine_Image_Entry *eim);
+EAPI void evas_cache_engine_parent_not_needed(Engine_Image_Entry *eim);
+EAPI Engine_Image_Entry* evas_cache_engine_image_engine(Evas_Cache_Engine_Image *cache, void *engine_data);
+EAPI void evas_cache_engine_image_drop(Engine_Image_Entry *eim);
+EAPI Engine_Image_Entry* evas_cache_engine_image_alone(Engine_Image_Entry *eim, void *data);
+EAPI Engine_Image_Entry* evas_cache_engine_image_dirty(Engine_Image_Entry *eim, int x, int y, int w, int h);
+EAPI Engine_Image_Entry* evas_cache_engine_image_copied_data(Evas_Cache_Engine_Image *cache, int w, int h, DATA32 *image_data, int alpha, int cspace, void *engine_data);
+EAPI Engine_Image_Entry* evas_cache_engine_image_data(Evas_Cache_Engine_Image *cache, int w, int h, DATA32 *image_data, int alpha, int cspace, void *engine_data);
+EAPI void evas_cache_engine_image_colorspace(Engine_Image_Entry *eim, int cspace, void *engine_data);
+EAPI Engine_Image_Entry* evas_cache_engine_image_size_set(Engine_Image_Entry *eim, int w, int h);
+
+EAPI void evas_cache_engine_image_load_data(Engine_Image_Entry *eim);
/*****************************************************************************/
diff --git a/src/lib/include/evas_common_soft16.h b/src/lib/include/evas_common_soft16.h
index 17ccd32..a6cf0e3 100644
--- a/src/lib/include/evas_common_soft16.h
+++ b/src/lib/include/evas_common_soft16.h
@@ -4,6 +4,10 @@
#include "evas_common.h"
#include "evas_private.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#ifndef always_inline
#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
# define always_inline __attribute__((always_inline)) inline
@@ -136,4 +140,8 @@ EAPI void *soft16_font_glyph_new(void *data, RGBA_Font_Glyph *fg);
EAPI void soft16_font_glyph_free(void *ext_dat);
EAPI void soft16_font_glyph_draw(void *data, void *dest, void *context, RGBA_Font_Glyph *fg, int x, int y);
+#ifdef __cplusplus
+}
+#endif
+
#endif
--
Enlightenment DR17 advanced canvas library
More information about the Pkg-e-commits
mailing list