diff options
Diffstat (limited to 'src/lib/evas/common')
52 files changed, 489 insertions, 516 deletions
diff --git a/src/lib/evas/common/evas_blend.h b/src/lib/evas/common/evas_blend.h index 1a98f3f550..f8aba7269f 100644 --- a/src/lib/evas/common/evas_blend.h +++ b/src/lib/evas/common/evas_blend.h @@ -2,7 +2,7 @@ #define _EVAS_BLEND_H -EAPI void evas_common_blend_init (void); +EVAS_API void evas_common_blend_init (void); #endif /* _EVAS_BLEND_H */ diff --git a/src/lib/evas/common/evas_blend_main.c b/src/lib/evas/common/evas_blend_main.c index ebac8f35b5..ce9e6bb38e 100644 --- a/src/lib/evas/common/evas_blend_main.c +++ b/src/lib/evas/common/evas_blend_main.c @@ -64,7 +64,7 @@ evas_gfx_compositor_get(unsigned char op) return comp; } -EAPI void +EVAS_API void evas_common_blend_init(void) { static int gfx_initialised = 0; diff --git a/src/lib/evas/common/evas_blit_main.c b/src/lib/evas/common/evas_blit_main.c index dc38638518..2457716b47 100644 --- a/src/lib/evas/common/evas_blit_main.c +++ b/src/lib/evas/common/evas_blit_main.c @@ -26,12 +26,12 @@ static void evas_common_copy_pixels_rev_sse/*NB*/ (DATA32 *src, DATA32 *dst, int static void evas_common_copy_rev_pixels_c (DATA32 *src, DATA32 *dst, int len); -EAPI void +EVAS_API void evas_common_blit_init(void) { } -EAPI void +EVAS_API void evas_common_blit_rectangle(const RGBA_Image *src, RGBA_Image *dst, int src_x, int src_y, int w, int h, int dst_x, int dst_y) { int y; diff --git a/src/lib/evas/common/evas_common_generic_cache.c b/src/lib/evas/common/evas_common_generic_cache.c index 87c040e8ee..db979de552 100644 --- a/src/lib/evas/common/evas_common_generic_cache.c +++ b/src/lib/evas/common/evas_common_generic_cache.c @@ -1,6 +1,6 @@ #include "evas_common_private.h" -EAPI Generic_Cache* +EVAS_API Generic_Cache* generic_cache_new(void *user_data, Generic_Cache_Free func) { Generic_Cache *cache; @@ -11,7 +11,7 @@ generic_cache_new(void *user_data, Generic_Cache_Free func) return cache; } -EAPI void +EVAS_API void generic_cache_destroy(Generic_Cache *cache) { Generic_Cache_Entry *entry; @@ -27,7 +27,7 @@ generic_cache_destroy(Generic_Cache *cache) } } -EAPI void +EVAS_API void generic_cache_dump(Generic_Cache *cache) { Generic_Cache_Entry *entry; @@ -42,7 +42,7 @@ generic_cache_dump(Generic_Cache *cache) } } -EAPI void +EVAS_API void generic_cache_data_set(Generic_Cache *cache, void *key, void *surface) { Generic_Cache_Entry *entry = NULL; @@ -67,7 +67,7 @@ generic_cache_data_set(Generic_Cache *cache, void *key, void *surface) } } -EAPI void * +EVAS_API void * generic_cache_data_get(Generic_Cache *cache, void *key) { Generic_Cache_Entry *entry = NULL, *lru_data; @@ -92,7 +92,7 @@ generic_cache_data_get(Generic_Cache *cache, void *key) return NULL; } -EAPI void +EVAS_API void generic_cache_data_drop(Generic_Cache *cache, void *key) { Generic_Cache_Entry *entry = NULL; diff --git a/src/lib/evas/common/evas_convert_color.c b/src/lib/evas/common/evas_convert_color.c index 548c8c5d50..5ac168c050 100644 --- a/src/lib/evas/common/evas_convert_color.c +++ b/src/lib/evas/common/evas_convert_color.c @@ -2,7 +2,7 @@ #include "evas_convert_color.h" #include "draw.h" -EAPI DATA32 +EVAS_API DATA32 evas_common_convert_ag_premul(DATA16 *data, unsigned int len) { DATA16 *de = data + len; @@ -23,7 +23,7 @@ evas_common_convert_ag_premul(DATA16 *data, unsigned int len) return nas; } -EAPI void +EVAS_API void evas_common_convert_ag_unpremul(DATA16 *data, unsigned int len) { DATA16 *de = data + len; @@ -51,19 +51,19 @@ evas_common_convert_ag_unpremul(DATA16 *data, unsigned int len) } } -EAPI DATA32 +EVAS_API DATA32 evas_common_convert_argb_premul(DATA32 *data, unsigned int len) { return (DATA32) efl_draw_argb_premul(data, len); } -EAPI void +EVAS_API void evas_common_convert_argb_unpremul(DATA32 *data, unsigned int len) { return efl_draw_argb_unpremul(data, len); } -EAPI void +EVAS_API void evas_common_convert_color_argb_premul(int a, int *r, int *g, int *b) { a++; @@ -72,7 +72,7 @@ evas_common_convert_color_argb_premul(int a, int *r, int *g, int *b) if (b) { *b = (a * *b) >> 8; } } -EAPI void +EVAS_API void evas_common_convert_color_argb_unpremul(int a, int *r, int *g, int *b) { if (!a) return; @@ -81,7 +81,7 @@ evas_common_convert_color_argb_unpremul(int a, int *r, int *g, int *b) if (b) { *b = (255 * *b) / a; } } -EAPI void +EVAS_API void evas_common_convert_color_hsv_to_rgb(float h, float s, float v, int *r, int *g, int *b) { int i; @@ -139,7 +139,7 @@ evas_common_convert_color_hsv_to_rgb(float h, float s, float v, int *r, int *g, } } -EAPI void +EVAS_API void evas_common_convert_color_rgb_to_hsv(int r, int g, int b, float *h, float *s, float *v) { int max, min, d = r - g; @@ -194,7 +194,7 @@ evas_common_convert_color_rgb_to_hsv(int r, int g, int b, float *h, float *s, fl } } -EAPI void +EVAS_API void evas_common_convert_color_hsv_to_rgb_int(int h, int s, int v, int *r, int *g, int *b) { int i, f; @@ -234,7 +234,7 @@ evas_common_convert_color_hsv_to_rgb_int(int h, int s, int v, int *r, int *g, in } } -EAPI void +EVAS_API void evas_common_convert_color_rgb_to_hsv_int(int r, int g, int b, int *h, int *s, int *v) { int min, max, d = r - g; diff --git a/src/lib/evas/common/evas_convert_color.h b/src/lib/evas/common/evas_convert_color.h index 54bd59e138..ce139e5837 100644 --- a/src/lib/evas/common/evas_convert_color.h +++ b/src/lib/evas/common/evas_convert_color.h @@ -2,17 +2,17 @@ #define _EVAS_CONVERT_COLOR_H -EAPI DATA32 evas_common_convert_ag_premul (DATA16 *data, unsigned int len); -EAPI void evas_common_convert_ag_unpremul (DATA16 *data, unsigned int len); -EAPI DATA32 evas_common_convert_argb_premul (DATA32 *src, unsigned int len); -EAPI void evas_common_convert_argb_unpremul (DATA32 *src, unsigned int len); -EAPI void evas_common_convert_color_argb_premul (int a, int *r, int *g, int *b); -EAPI void evas_common_convert_color_argb_unpremul (int a, int *r, int *g, int *b); +EVAS_API DATA32 evas_common_convert_ag_premul (DATA16 *data, unsigned int len); +EVAS_API void evas_common_convert_ag_unpremul (DATA16 *data, unsigned int len); +EVAS_API DATA32 evas_common_convert_argb_premul (DATA32 *src, unsigned int len); +EVAS_API void evas_common_convert_argb_unpremul (DATA32 *src, unsigned int len); +EVAS_API void evas_common_convert_color_argb_premul (int a, int *r, int *g, int *b); +EVAS_API void evas_common_convert_color_argb_unpremul (int a, int *r, int *g, int *b); -EAPI void evas_common_convert_color_hsv_to_rgb (float h, float s, float v, int *r, int *g, int *b); -EAPI void evas_common_convert_color_rgb_to_hsv (int r, int g, int b, float *h, float *s, float *v); -EAPI void evas_common_convert_color_hsv_to_rgb_int (int h, int s, int v, int *r, int *g, int *b); -EAPI void evas_common_convert_color_rgb_to_hsv_int (int r, int g, int b, int *h, int *s, int *v); +EVAS_API void evas_common_convert_color_hsv_to_rgb (float h, float s, float v, int *r, int *g, int *b); +EVAS_API void evas_common_convert_color_rgb_to_hsv (int r, int g, int b, float *h, float *s, float *v); +EVAS_API void evas_common_convert_color_hsv_to_rgb_int (int h, int s, int v, int *r, int *g, int *b); +EVAS_API void evas_common_convert_color_rgb_to_hsv_int (int r, int g, int b, int *h, int *s, int *v); #endif /* _EVAS_CONVERT_COLOR_H */ diff --git a/src/lib/evas/common/evas_convert_colorspace.c b/src/lib/evas/common/evas_convert_colorspace.c index eaa365b135..229b307abc 100644 --- a/src/lib/evas/common/evas_convert_colorspace.c +++ b/src/lib/evas/common/evas_convert_colorspace.c @@ -155,7 +155,7 @@ evas_common_convert_argb8888_to_a8(void *data, int w, int h, int stride, Eina_Bo return ret; } -EAPI void * +EVAS_API void * evas_common_convert_argb8888_to(void *data, int w, int h, int stride, Eina_Bool has_alpha, Evas_Colorspace cspace) { switch (cspace) @@ -170,7 +170,7 @@ evas_common_convert_argb8888_to(void *data, int w, int h, int stride, Eina_Bool return NULL; } -EAPI void * +EVAS_API void * evas_common_convert_rgb565_a5p_to(void *data, int w, int h, int stride, Eina_Bool has_alpha, Evas_Colorspace cspace) { switch (cspace) @@ -183,7 +183,7 @@ evas_common_convert_rgb565_a5p_to(void *data, int w, int h, int stride, Eina_Boo return NULL; } -EAPI void * +EVAS_API void * evas_common_convert_yuv_422_601_to(void *data, int w, int h, Evas_Colorspace cspace) { switch (cspace) @@ -204,7 +204,7 @@ evas_common_convert_yuv_422_601_to(void *data, int w, int h, Evas_Colorspace csp return NULL; } -EAPI void * +EVAS_API void * evas_common_convert_yuv_422P_601_to(void *data, int w, int h, Evas_Colorspace cspace) { switch (cspace) @@ -225,7 +225,7 @@ evas_common_convert_yuv_422P_601_to(void *data, int w, int h, Evas_Colorspace cs return NULL; } -EAPI void * +EVAS_API void * evas_common_convert_yuv_420_601_to(void *data, int w, int h, Evas_Colorspace cspace) { switch (cspace) @@ -246,7 +246,7 @@ evas_common_convert_yuv_420_601_to(void *data, int w, int h, Evas_Colorspace csp return NULL; } -EAPI void * +EVAS_API void * evas_common_convert_yuv_420T_601_to(void *data, int w, int h, Evas_Colorspace cspace) { switch (cspace) diff --git a/src/lib/evas/common/evas_convert_colorspace.h b/src/lib/evas/common/evas_convert_colorspace.h index 51a94f9aeb..c1f2854077 100644 --- a/src/lib/evas/common/evas_convert_colorspace.h +++ b/src/lib/evas/common/evas_convert_colorspace.h @@ -2,12 +2,12 @@ #define _EVAS_CONVERT_COLORSPACE_H -EAPI void *evas_common_convert_argb8888_to (void *data, int w, int h, int stride, Eina_Bool has_alpha, Evas_Colorspace cspace); -EAPI void *evas_common_convert_rgb565_a5p_to (void *data, int w, int h, int stride, Eina_Bool has_alpha, Evas_Colorspace cspace); -EAPI void *evas_common_convert_yuv_422P_601_to(void *data, int w, int h, Evas_Colorspace cspace); -EAPI void *evas_common_convert_yuv_422_601_to (void *data, int w, int h, Evas_Colorspace cspace); -EAPI void *evas_common_convert_yuv_420_601_to (void *data, int w, int h, Evas_Colorspace cspace); -EAPI void *evas_common_convert_yuv_420T_601_to(void *data, int w, int h, Evas_Colorspace cspace); +EVAS_API void *evas_common_convert_argb8888_to (void *data, int w, int h, int stride, Eina_Bool has_alpha, Evas_Colorspace cspace); +EVAS_API void *evas_common_convert_rgb565_a5p_to (void *data, int w, int h, int stride, Eina_Bool has_alpha, Evas_Colorspace cspace); +EVAS_API void *evas_common_convert_yuv_422P_601_to(void *data, int w, int h, Evas_Colorspace cspace); +EVAS_API void *evas_common_convert_yuv_422_601_to (void *data, int w, int h, Evas_Colorspace cspace); +EVAS_API void *evas_common_convert_yuv_420_601_to (void *data, int w, int h, Evas_Colorspace cspace); +EVAS_API void *evas_common_convert_yuv_420T_601_to(void *data, int w, int h, Evas_Colorspace cspace); void *evas_common_convert_agry88_to(const void *data, int w, int h, int stride, Eina_Bool has_alpha, Evas_Colorspace cspace); void *evas_common_convert_gry8_to(const void *data, int w, int h, int stride, Eina_Bool has_alpha, Evas_Colorspace cspace); diff --git a/src/lib/evas/common/evas_convert_main.c b/src/lib/evas/common/evas_convert_main.c index c9b4363fe8..509dee4b46 100644 --- a/src/lib/evas/common/evas_convert_main.c +++ b/src/lib/evas/common/evas_convert_main.c @@ -151,12 +151,12 @@ const DATA8 _evas_dither_128128[128][128] = }; #endif /* USE_DITHER_128128 */ -EAPI void +EVAS_API void evas_common_convert_init(void) { } -EAPI Gfx_Func_Convert +EVAS_API Gfx_Func_Convert evas_common_convert_func_get(DATA8 *dest, int w, int h EINA_UNUSED, int depth, DATA32 rmask, DATA32 gmask, DATA32 bmask, Convert_Pal_Mode pal_mode, int rotation) { if ((rmask == 0) && (gmask == 0) && (bmask == 0)) diff --git a/src/lib/evas/common/evas_convert_main.h b/src/lib/evas/common/evas_convert_main.h index 51c2cc888f..03f0c85e8e 100644 --- a/src/lib/evas/common/evas_convert_main.h +++ b/src/lib/evas/common/evas_convert_main.h @@ -2,8 +2,8 @@ #define _EVAS_CONVERT_MAIN_H -EAPI void evas_common_convert_init (void); -EAPI Gfx_Func_Convert evas_common_convert_func_get (DATA8 *dest, int w, int h, int depth, DATA32 rmask, DATA32 gmask, DATA32 bmask, Convert_Pal_Mode pal_mode, int rotation); +EVAS_API void evas_common_convert_init (void); +EVAS_API Gfx_Func_Convert evas_common_convert_func_get (DATA8 *dest, int w, int h, int depth, DATA32 rmask, DATA32 gmask, DATA32 bmask, Convert_Pal_Mode pal_mode, int rotation); #endif /* _EVAS_CONVERT_MAIN_H */ diff --git a/src/lib/evas/common/evas_convert_yuv.h b/src/lib/evas/common/evas_convert_yuv.h index 1cadf2b1a3..3f59a28b2d 100644 --- a/src/lib/evas/common/evas_convert_yuv.h +++ b/src/lib/evas/common/evas_convert_yuv.h @@ -1,11 +1,11 @@ #ifndef _EVAS_CONVERT_YUV_H #define _EVAS_CONVERT_YUV_H -EAPI void evas_common_convert_yuv_422p_709_rgba (DATA8 **src, DATA8 *dst, int w, int h); +EVAS_API void evas_common_convert_yuv_422p_709_rgba (DATA8 **src, DATA8 *dst, int w, int h); -EAPI void evas_common_convert_yuv_422p_601_rgba (DATA8 **src, DATA8 *dst, int w, int h); -EAPI void evas_common_convert_yuv_422_601_rgba (DATA8 **src, DATA8 *dst, int w, int h); -EAPI void evas_common_convert_yuv_420_601_rgba (DATA8 **src, DATA8 *dst, int w, int h); -EAPI void evas_common_convert_yuv_420T_601_rgba (DATA8 **src, DATA8 *dst, int w, int h); +EVAS_API void evas_common_convert_yuv_422p_601_rgba (DATA8 **src, DATA8 *dst, int w, int h); +EVAS_API void evas_common_convert_yuv_422_601_rgba (DATA8 **src, DATA8 *dst, int w, int h); +EVAS_API void evas_common_convert_yuv_420_601_rgba (DATA8 **src, DATA8 *dst, int w, int h); +EVAS_API void evas_common_convert_yuv_420T_601_rgba (DATA8 **src, DATA8 *dst, int w, int h); #endif /* _EVAS_CONVERT_YUV_H */ diff --git a/src/lib/evas/common/evas_cpu.c b/src/lib/evas/common/evas_cpu.c index a91ffe6930..b44cbc69f6 100644 --- a/src/lib/evas/common/evas_cpu.c +++ b/src/lib/evas/common/evas_cpu.c @@ -9,7 +9,7 @@ _cpu_check(Eina_Cpu_Features f) return (features & f) == f; } -EAPI void +EVAS_API void evas_common_cpu_init(void) { static int called = 0; @@ -79,7 +79,7 @@ evas_common_cpu_have_cpuid(void) return 0; } -EAPI void +EVAS_API void evas_common_cpu_can_do(int *mmx, int *sse, int *sse2) { static int do_mmx = 0, do_sse = 0, do_sse2 = 0, done = 0; @@ -98,7 +98,7 @@ evas_common_cpu_can_do(int *mmx, int *sse, int *sse2) } #ifdef BUILD_MMX -EAPI void +EVAS_API void evas_common_cpu_end_opt(void) { if (cpu_feature_mask & (CPU_FEATURE_MMX | CPU_FEATURE_MMX2)) @@ -107,7 +107,7 @@ evas_common_cpu_end_opt(void) } } #else -EAPI void +EVAS_API void evas_common_cpu_end_opt(void) { } diff --git a/src/lib/evas/common/evas_draw.h b/src/lib/evas/common/evas_draw.h index e045a186ce..2906d6a895 100644 --- a/src/lib/evas/common/evas_draw.h +++ b/src/lib/evas/common/evas_draw.h @@ -2,12 +2,12 @@ #define _EVAS_DRAW_H -EAPI void evas_common_draw_init (void); +EVAS_API void evas_common_draw_init (void); -EAPI RGBA_Draw_Context *evas_common_draw_context_new (void); -EAPI RGBA_Draw_Context *evas_common_draw_context_dup (RGBA_Draw_Context *dc); -EAPI void evas_common_draw_context_free (RGBA_Draw_Context *dc); -EAPI void evas_common_draw_context_font_ext_set (RGBA_Draw_Context *dc, +EVAS_API RGBA_Draw_Context *evas_common_draw_context_new (void); +EVAS_API RGBA_Draw_Context *evas_common_draw_context_dup (RGBA_Draw_Context *dc); +EVAS_API void evas_common_draw_context_free (RGBA_Draw_Context *dc); +EVAS_API void evas_common_draw_context_font_ext_set (RGBA_Draw_Context *dc, void *data, void *(*gl_new) (void *data, RGBA_Font_Glyph *fg), void (*gl_free) (void *ext_dat), @@ -15,24 +15,24 @@ EAPI void evas_common_draw_context_font_ext_set (RGBA_D void *(*gl_image_new) (void *gc, RGBA_Font_Glyph *fg, int alpha, Evas_Colorspace cspace), void (*gl_image_free) (void *image), void (*gl_image_draw) (void *gc, void *im, int dx, int dy, int dw, int dh, int smooth)); -EAPI void evas_common_draw_context_clip_clip (RGBA_Draw_Context *dc, int x, int y, int w, int h); -EAPI void evas_common_draw_context_set_clip (RGBA_Draw_Context *dc, int x, int y, int w, int h); -EAPI void evas_common_draw_context_unset_clip (RGBA_Draw_Context *dc); -EAPI void evas_common_draw_context_set_color (RGBA_Draw_Context *dc, int r, int g, int b, int a); -EAPI void evas_common_draw_context_set_multiplier (RGBA_Draw_Context *dc, int r, int g, int b, int a); -EAPI void evas_common_draw_context_unset_multiplier (RGBA_Draw_Context *dc); -EAPI Cutout_Rects *evas_common_draw_context_cutouts_new (void); -EAPI void evas_common_draw_context_cutouts_free (Cutout_Rects* rects); -EAPI void evas_common_draw_context_cutouts_real_free (Cutout_Rects* rects); -EAPI void evas_common_draw_context_cutouts_del (Cutout_Rects* rects, int idx); -EAPI void evas_common_draw_context_add_cutout (RGBA_Draw_Context *dc, int x, int y, int w, int h); -EAPI void evas_common_draw_context_clear_cutouts (RGBA_Draw_Context *dc); -EAPI Cutout_Rects *evas_common_draw_context_apply_cutouts (RGBA_Draw_Context *dc, Cutout_Rects *recycle); -EAPI void evas_common_draw_context_apply_clear_cutouts (Cutout_Rects* rects); -EAPI void evas_common_draw_context_apply_clean_cutouts (Cutout_Rects* rects); -EAPI void evas_common_draw_context_set_anti_alias (RGBA_Draw_Context *dc, unsigned char aa); -EAPI void evas_common_draw_context_set_color_interpolation (RGBA_Draw_Context *dc, int color_space); -EAPI void evas_common_draw_context_set_render_op (RGBA_Draw_Context *dc, int op); -EAPI void evas_common_draw_context_target_set (RGBA_Draw_Context *dc, int x, int y, int w, int h); +EVAS_API void evas_common_draw_context_clip_clip (RGBA_Draw_Context *dc, int x, int y, int w, int h); +EVAS_API void evas_common_draw_context_set_clip (RGBA_Draw_Context *dc, int x, int y, int w, int h); +EVAS_API void evas_common_draw_context_unset_clip (RGBA_Draw_Context *dc); +EVAS_API void evas_common_draw_context_set_color (RGBA_Draw_Context *dc, int r, int g, int b, int a); +EVAS_API void evas_common_draw_context_set_multiplier (RGBA_Draw_Context *dc, int r, int g, int b, int a); +EVAS_API void evas_common_draw_context_unset_multiplier (RGBA_Draw_Context *dc); +EVAS_API Cutout_Rects *evas_common_draw_context_cutouts_new (void); +EVAS_API void evas_common_draw_context_cutouts_free (Cutout_Rects* rects); +EVAS_API void evas_common_draw_context_cutouts_real_free (Cutout_Rects* rects); +EVAS_API void evas_common_draw_context_cutouts_del (Cutout_Rects* rects, int idx); +EVAS_API void evas_common_draw_context_add_cutout (RGBA_Draw_Context *dc, int x, int y, int w, int h); +EVAS_API void evas_common_draw_context_clear_cutouts (RGBA_Draw_Context *dc); +EVAS_API Cutout_Rects *evas_common_draw_context_apply_cutouts (RGBA_Draw_Context *dc, Cutout_Rects *recycle); +EVAS_API void evas_common_draw_context_apply_clear_cutouts (Cutout_Rects* rects); +EVAS_API void evas_common_draw_context_apply_clean_cutouts (Cutout_Rects* rects); +EVAS_API void evas_common_draw_context_set_anti_alias (RGBA_Draw_Context *dc, unsigned char aa); +EVAS_API void evas_common_draw_context_set_color_interpolation (RGBA_Draw_Context *dc, int color_space); +EVAS_API void evas_common_draw_context_set_render_op (RGBA_Draw_Context *dc, int op); +EVAS_API void evas_common_draw_context_target_set (RGBA_Draw_Context *dc, int x, int y, int w, int h); #endif /* _EVAS_DRAW_H */ diff --git a/src/lib/evas/common/evas_draw_main.c b/src/lib/evas/common/evas_draw_main.c index 3b19fe1956..832235765f 100644 --- a/src/lib/evas/common/evas_draw_main.c +++ b/src/lib/evas/common/evas_draw_main.c @@ -2,7 +2,7 @@ #include "evas_convert_main.h" #include "evas_private.h" -EAPI Cutout_Rects * +EVAS_API Cutout_Rects * evas_common_draw_context_cutouts_new(void) { Cutout_Rects *rects; @@ -28,7 +28,7 @@ evas_common_draw_context_cutouts_dup(Cutout_Rects *rects2, const Cutout_Rects *r else rects2->rects = NULL; } -EAPI void +EVAS_API void evas_common_draw_context_cutouts_free(Cutout_Rects* rects) { if (!rects) return; @@ -36,7 +36,7 @@ evas_common_draw_context_cutouts_free(Cutout_Rects* rects) rects->last_add.w = 0; } -EAPI void +EVAS_API void evas_common_draw_context_cutouts_real_free(Cutout_Rects* rects) { if (!rects) return; @@ -44,7 +44,7 @@ evas_common_draw_context_cutouts_real_free(Cutout_Rects* rects) free(rects); } -EAPI void +EVAS_API void evas_common_draw_context_cutouts_del(Cutout_Rects* rects, int idx) { if ((idx >= 0) && (idx < rects->active)) @@ -122,7 +122,7 @@ _evas_common_draw_context_find(void) return dc; } -EAPI void +EVAS_API void evas_common_init(void) { if (_init_count++) return; @@ -143,7 +143,7 @@ evas_common_init(void) evas_common_tilebuf_init(); } -EAPI void +EVAS_API void evas_common_shutdown(void) { if (--_init_count) return; @@ -162,12 +162,12 @@ evas_common_shutdown(void) // SLKD(_ctx_spares_lock); } -EAPI void +EVAS_API void evas_common_draw_init(void) { } -EAPI RGBA_Draw_Context * +EVAS_API RGBA_Draw_Context * evas_common_draw_context_new(void) { RGBA_Draw_Context *dc; @@ -177,7 +177,7 @@ evas_common_draw_context_new(void) return dc; } -EAPI RGBA_Draw_Context * +EVAS_API RGBA_Draw_Context * evas_common_draw_context_dup(RGBA_Draw_Context *dc) { RGBA_Draw_Context *dc2 = _evas_common_draw_context_find(); @@ -195,20 +195,20 @@ evas_common_draw_context_dup(RGBA_Draw_Context *dc) return dc2; } -EAPI void +EVAS_API void evas_common_draw_context_free(RGBA_Draw_Context *dc) { if (!dc) return; _evas_common_draw_context_stash(dc); } -EAPI void +EVAS_API void evas_common_draw_context_clear_cutouts(RGBA_Draw_Context *dc) { evas_common_draw_context_cutouts_free(&dc->cutout); } -EAPI void +EVAS_API void evas_common_draw_context_font_ext_set(RGBA_Draw_Context *dc, void *data, void *(*gl_new) (void *data, RGBA_Font_Glyph *fg), @@ -227,7 +227,7 @@ evas_common_draw_context_font_ext_set(RGBA_Draw_Context *dc, dc->font_ext.func.gl_image_draw = gl_image_draw; } -EAPI void +EVAS_API void evas_common_draw_context_clip_clip(RGBA_Draw_Context *dc, int x, int y, int w, int h) { if (dc->clip.use) @@ -239,7 +239,7 @@ evas_common_draw_context_clip_clip(RGBA_Draw_Context *dc, int x, int y, int w, i evas_common_draw_context_set_clip(dc, x, y, w, h); } -EAPI void +EVAS_API void evas_common_draw_context_set_clip(RGBA_Draw_Context *dc, int x, int y, int w, int h) { dc->clip.use = 1; @@ -249,13 +249,13 @@ evas_common_draw_context_set_clip(RGBA_Draw_Context *dc, int x, int y, int w, in dc->clip.h = h; } -EAPI void +EVAS_API void evas_common_draw_context_unset_clip(RGBA_Draw_Context *dc) { dc->clip.use = 0; } -EAPI void +EVAS_API void evas_common_draw_context_set_color(RGBA_Draw_Context *dc, int r, int g, int b, int a) { R_VAL(&(dc->col.col)) = (DATA8)r; @@ -280,7 +280,7 @@ evas_common_draw_context_set_color(RGBA_Draw_Context *dc, int r, int g, int b, i } -EAPI void +EVAS_API void evas_common_draw_context_set_multiplier(RGBA_Draw_Context *dc, int r, int g, int b, int a) { dc->mul.use = 1; @@ -290,14 +290,14 @@ evas_common_draw_context_set_multiplier(RGBA_Draw_Context *dc, int r, int g, int A_VAL(&(dc->mul.col)) = (DATA8)a; } -EAPI void +EVAS_API void evas_common_draw_context_unset_multiplier(RGBA_Draw_Context *dc) { dc->mul.use = 0; } -EAPI void +EVAS_API void evas_common_draw_context_add_cutout(RGBA_Draw_Context *dc, int x, int y, int w, int h) { // if (dc->cutout.rects > 512) return; @@ -643,7 +643,7 @@ evas_common_draw_context_cutout_split(Cutout_Rects *res, int idx, Cutout_Rect *s #undef R_NEW } -EAPI void +EVAS_API void evas_common_draw_context_target_set(RGBA_Draw_Context *dc, int x, int y, int w, int h) { dc->cutout_target.x = x; @@ -668,7 +668,7 @@ _srt_x(const void *d1, const void *d2) return r1->x - r2->x; } -EAPI Cutout_Rects * +EVAS_API Cutout_Rects * evas_common_draw_context_apply_cutouts(RGBA_Draw_Context *dc, Cutout_Rects *reuse) { Cutout_Rects *res = NULL; @@ -833,14 +833,14 @@ evas_common_draw_context_apply_cutouts(RGBA_Draw_Context *dc, Cutout_Rects *reus return res; } -EAPI void +EVAS_API void evas_common_draw_context_apply_clear_cutouts(Cutout_Rects *rects) { evas_common_draw_context_apply_clean_cutouts(rects); free(rects); } -EAPI void +EVAS_API void evas_common_draw_context_apply_clean_cutouts(Cutout_Rects *rects) { free(rects->rects); @@ -850,19 +850,19 @@ evas_common_draw_context_apply_clean_cutouts(Cutout_Rects *rects) rects->last_add.w = 0; } -EAPI void +EVAS_API void evas_common_draw_context_set_anti_alias(RGBA_Draw_Context *dc , unsigned char aa) { dc->anti_alias = !!aa; } -EAPI void +EVAS_API void evas_common_draw_context_set_color_interpolation(RGBA_Draw_Context *dc, int color_space) { dc->interpolation.color_space = color_space; } -EAPI void +EVAS_API void evas_common_draw_context_set_render_op(RGBA_Draw_Context *dc , int op) { dc->render_op = op; diff --git a/src/lib/evas/common/evas_font.h b/src/lib/evas/common/evas_font.h index 5a582c0632..24e3f771e1 100644 --- a/src/lib/evas/common/evas_font.h +++ b/src/lib/evas/common/evas_font.h @@ -22,31 +22,7 @@ typedef unsigned long long DATA64; #include "evas_text_utils.h" -#ifdef EAPI -# undef EAPI -#endif - -#ifdef _WIN32 -# ifdef EFL_BUILD -# ifdef DLL_EXPORT -# define EAPI __declspec(dllexport) -# else -# define EAPI -# endif -# else -# define EAPI __declspec(dllimport) -# endif -#else -# ifdef __GNUC__ -# if __GNUC__ >= 4 -# define EAPI __attribute__ ((visibility("default"))) -# else -# define EAPI -# endif -# else -# define EAPI -# endif -#endif +#include <evas_api.h> #define LK(x) Eina_Lock x #define LKI(x) eina_lock_new(&(x)) @@ -377,76 +353,76 @@ struct _RGBA_Font_Glyph /* main */ -EAPI void evas_common_font_init (void); -EAPI void evas_common_font_shutdown (void); -EAPI void evas_common_font_font_all_unload (void); - -EAPI int evas_common_font_ascent_get (RGBA_Font *fn); -EAPI int evas_common_font_descent_get (RGBA_Font *fn); -EAPI int evas_common_font_max_ascent_get (RGBA_Font *fn); -EAPI int evas_common_font_max_descent_get (RGBA_Font *fn); -EAPI int evas_common_font_instance_ascent_get (RGBA_Font_Int *fi); -EAPI int evas_common_font_instance_descent_get (RGBA_Font_Int *fi); -EAPI int evas_common_font_instance_max_ascent_get (RGBA_Font_Int *fi); -EAPI int evas_common_font_instance_max_descent_get (RGBA_Font_Int *fi); -EAPI int evas_common_font_instance_underline_position_get (RGBA_Font_Int *fi); -EAPI int evas_common_font_instance_underline_thickness_get (RGBA_Font_Int *fi); -EAPI int evas_common_font_get_line_advance (RGBA_Font *fn); -void *evas_common_font_freetype_face_get(RGBA_Font *font); /* XXX: Not EAPI on purpose. Not ment to be used in modules. */ - -EAPI RGBA_Font_Glyph *evas_common_font_int_cache_glyph_get (RGBA_Font_Int *fi, FT_UInt index); -EAPI Eina_Bool evas_common_font_int_cache_glyph_render(RGBA_Font_Glyph *fg); -EAPI FT_UInt evas_common_get_char_index (RGBA_Font_Int* fi, Eina_Unicode gl, Eina_Unicode variation_sequence); +EVAS_API void evas_common_font_init (void); +EVAS_API void evas_common_font_shutdown (void); +EVAS_API void evas_common_font_font_all_unload (void); + +EVAS_API int evas_common_font_ascent_get (RGBA_Font *fn); +EVAS_API int evas_common_font_descent_get (RGBA_Font *fn); +EVAS_API int evas_common_font_max_ascent_get (RGBA_Font *fn); +EVAS_API int evas_common_font_max_descent_get (RGBA_Font *fn); +EVAS_API int evas_common_font_instance_ascent_get (RGBA_Font_Int *fi); +EVAS_API int evas_common_font_instance_descent_get (RGBA_Font_Int *fi); +EVAS_API int evas_common_font_instance_max_ascent_get (RGBA_Font_Int *fi); +EVAS_API int evas_common_font_instance_max_descent_get (RGBA_Font_Int *fi); +EVAS_API int evas_common_font_instance_underline_position_get (RGBA_Font_Int *fi); +EVAS_API int evas_common_font_instance_underline_thickness_get (RGBA_Font_Int *fi); +EVAS_API int evas_common_font_get_line_advance (RGBA_Font *fn); +void *evas_common_font_freetype_face_get(RGBA_Font *font); /* XXX: Not EVAS_API on purpose. Not ment to be used in modules. */ + +EVAS_API RGBA_Font_Glyph *evas_common_font_int_cache_glyph_get (RGBA_Font_Int *fi, FT_UInt index); +EVAS_API Eina_Bool evas_common_font_int_cache_glyph_render(RGBA_Font_Glyph *fg); +EVAS_API FT_UInt evas_common_get_char_index (RGBA_Font_Int* fi, Eina_Unicode gl, Eina_Unicode variation_sequence); /* load */ -EAPI void evas_common_font_dpi_set (int dpi_h, int dpi_v); -EAPI RGBA_Font_Source *evas_common_font_source_memory_load (const char *name, const void *data, int data_size); -EAPI RGBA_Font_Source *evas_common_font_source_load (const char *name); -EAPI int evas_common_font_source_load_complete (RGBA_Font_Source *fs); -EAPI RGBA_Font_Source *evas_common_font_source_find (const char *name); -EAPI void evas_common_font_source_free (RGBA_Font_Source *fs); -EAPI void evas_common_font_size_use (RGBA_Font *fn); -EAPI RGBA_Font_Int *evas_common_font_int_load (const char *name, int size, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable); -EAPI RGBA_Font_Int *evas_common_font_int_load_init (RGBA_Font_Int *fn); -EAPI RGBA_Font_Int *evas_common_font_int_load_complete (RGBA_Font_Int *fi); -EAPI RGBA_Font *evas_common_font_memory_load (const char *source, const char *name, int size, const void *data, int data_size, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable); -EAPI RGBA_Font *evas_common_font_load (const char *name, int size, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable); -EAPI RGBA_Font *evas_common_font_add (RGBA_Font *fn, const char *name, int size, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable); -EAPI RGBA_Font *evas_common_font_memory_add (RGBA_Font *fn, const char *source, const char *name, int size, const void *data, int data_size, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable); -EAPI void evas_common_font_free (RGBA_Font *fn); -EAPI void evas_common_font_int_unref (RGBA_Font_Int *fi); -EAPI void evas_common_font_hinting_set (RGBA_Font *fn, Font_Hint_Flags hinting); -EAPI Eina_Bool evas_common_hinting_available (Font_Hint_Flags hinting); -EAPI RGBA_Font *evas_common_font_memory_hinting_load (const char *source, const char *name, int size, const void *data, int data_size, Font_Hint_Flags hinting, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable); -EAPI RGBA_Font *evas_common_font_hinting_load (const char *name, int size, Font_Hint_Flags hinting, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable); -EAPI RGBA_Font *evas_common_font_hinting_add (RGBA_Font *fn, const char *name, int size, Font_Hint_Flags hinting, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable); -EAPI RGBA_Font *evas_common_font_memory_hinting_add (RGBA_Font *fn, const char *source, const char *name, int size, const void *data, int data_size, Font_Hint_Flags hinting, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable); -EAPI void evas_common_font_int_modify_cache_by (RGBA_Font_Int *fi, int dir); -EAPI int evas_common_font_cache_get (void); -EAPI void evas_common_font_cache_set (int size); -EAPI void evas_common_font_flush (void); -EAPI void evas_common_font_flush_last (void); -EAPI RGBA_Font_Int *evas_common_font_int_find (const char *name, int size, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable); -EAPI void evas_common_font_all_clear (void); -EAPI void evas_common_font_ext_clear (void); +EVAS_API void evas_common_font_dpi_set (int dpi_h, int dpi_v); +EVAS_API RGBA_Font_Source *evas_common_font_source_memory_load (const char *name, const void *data, int data_size); +EVAS_API RGBA_Font_Source *evas_common_font_source_load (const char *name); +EVAS_API int evas_common_font_source_load_complete (RGBA_Font_Source *fs); +EVAS_API RGBA_Font_Source *evas_common_font_source_find (const char *name); +EVAS_API void evas_common_font_source_free (RGBA_Font_Source *fs); +EVAS_API void evas_common_font_size_use (RGBA_Font *fn); +EVAS_API RGBA_Font_Int *evas_common_font_int_load (const char *name, int size, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable); +EVAS_API RGBA_Font_Int *evas_common_font_int_load_init (RGBA_Font_Int *fn); +EVAS_API RGBA_Font_Int *evas_common_font_int_load_complete (RGBA_Font_Int *fi); +EVAS_API RGBA_Font *evas_common_font_memory_load (const char *source, const char *name, int size, const void *data, int data_size, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable); +EVAS_API RGBA_Font *evas_common_font_load (const char *name, int size, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable); +EVAS_API RGBA_Font *evas_common_font_add (RGBA_Font *fn, const char *name, int size, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable); +EVAS_API RGBA_Font *evas_common_font_memory_add (RGBA_Font *fn, const char *source, const char *name, int size, const void *data, int data_size, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable); +EVAS_API void evas_common_font_free (RGBA_Font *fn); +EVAS_API void evas_common_font_int_unref (RGBA_Font_Int *fi); +EVAS_API void evas_common_font_hinting_set (RGBA_Font *fn, Font_Hint_Flags hinting); +EVAS_API Eina_Bool evas_common_hinting_available (Font_Hint_Flags hinting); +EVAS_API RGBA_Font *evas_common_font_memory_hinting_load (const char *source, const char *name, int size, const void *data, int data_size, Font_Hint_Flags hinting, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable); +EVAS_API RGBA_Font *evas_common_font_hinting_load (const char *name, int size, Font_Hint_Flags hinting, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable); +EVAS_API RGBA_Font *evas_common_font_hinting_add (RGBA_Font *fn, const char *name, int size, Font_Hint_Flags hinting, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable); +EVAS_API RGBA_Font *evas_common_font_memory_hinting_add (RGBA_Font *fn, const char *source, const char *name, int size, const void *data, int data_size, Font_Hint_Flags hinting, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable); +EVAS_API void evas_common_font_int_modify_cache_by (RGBA_Font_Int *fi, int dir); +EVAS_API int evas_common_font_cache_get (void); +EVAS_API void evas_common_font_cache_set (int size); +EVAS_API void evas_common_font_flush (void); +EVAS_API void evas_common_font_flush_last (void); +EVAS_API RGBA_Font_Int *evas_common_font_int_find (const char *name, int size, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable); +EVAS_API void evas_common_font_all_clear (void); +EVAS_API void evas_common_font_ext_clear (void); /* query */ -EAPI int evas_common_font_query_kerning (RGBA_Font_Int* fi, FT_UInt left, FT_UInt right, int* kerning); -EAPI void evas_common_font_query_size (RGBA_Font *fn, const Evas_Text_Props *intl_props, int *w, int *h); -EAPI int evas_common_font_query_inset (RGBA_Font *fn, const Evas_Text_Props *text_props); -EAPI int evas_common_font_query_right_inset (RGBA_Font *fn, const Evas_Text_Props *text_props); -EAPI void evas_common_font_query_advance (RGBA_Font *fn, const Evas_Text_Props *intl_props, int *h_adv, int *v_adv); -EAPI int evas_common_font_query_char_coords (RGBA_Font *fn, const Evas_Text_Props *intl_props, int pos, int *cx, int *cy, int *cw, int *ch); -EAPI int evas_common_font_query_pen_coords (RGBA_Font *fn, const Evas_Text_Props *intl_props, int pos, int *cpen_x, int *cy, int *cadv, int *ch); -EAPI int evas_common_font_query_char_at_coords (RGBA_Font *fn, const Evas_Text_Props *intl_props, int x, int y, int *cx, int *cy, int *cw, int *ch); -EAPI int evas_common_font_query_last_up_to_pos (RGBA_Font *fn, const Evas_Text_Props *intl_props, int x, int y, int width_offset); -EAPI int evas_common_font_query_run_font_end_get(RGBA_Font *fn, RGBA_Font_Int **script_fi, RGBA_Font_Int **cur_fi, Evas_Script_Type script, const Eina_Unicode *text, int run_len); -EAPI void evas_common_font_ascent_descent_get(RGBA_Font *fn, const Evas_Text_Props *text_props, int *ascent, int *descent); - -EAPI void *evas_common_font_glyph_compress(void *data, int num_grays, int pixel_mode, int pitch_data, int w, int h, int *size_ret); -EAPI DATA8 *evas_common_font_glyph_uncompress(RGBA_Font_Glyph *fg, int *wret, int *hret); -EAPI int evas_common_font_glyph_search (RGBA_Font *fn, RGBA_Font_Int **fi_ret, Eina_Unicode gl, Eina_Unicode variation_sequence, uint32_t evas_font_search_options); +EVAS_API int evas_common_font_query_kerning (RGBA_Font_Int* fi, FT_UInt left, FT_UInt right, int* kerning); +EVAS_API void evas_common_font_query_size (RGBA_Font *fn, const Evas_Text_Props *intl_props, int *w, int *h); +EVAS_API int evas_common_font_query_inset (RGBA_Font *fn, const Evas_Text_Props *text_props); +EVAS_API int evas_common_font_query_right_inset (RGBA_Font *fn, const Evas_Text_Props *text_props); +EVAS_API void evas_common_font_query_advance (RGBA_Font *fn, const Evas_Text_Props *intl_props, int *h_adv, int *v_adv); +EVAS_API int evas_common_font_query_char_coords (RGBA_Font *fn, const Evas_Text_Props *intl_props, int pos, int *cx, int *cy, int *cw, int *ch); +EVAS_API int evas_common_font_query_pen_coords (RGBA_Font *fn, const Evas_Text_Props *intl_props, int pos, int *cpen_x, int *cy, int *cadv, int *ch); +EVAS_API int evas_common_font_query_char_at_coords (RGBA_Font *fn, const Evas_Text_Props *intl_props, int x, int y, int *cx, int *cy, int *cw, int *ch); +EVAS_API int evas_common_font_query_last_up_to_pos (RGBA_Font *fn, const Evas_Text_Props *intl_props, int x, int y, int width_offset); +EVAS_API int evas_common_font_query_run_font_end_get(RGBA_Font *fn, RGBA_Font_Int **script_fi, RGBA_Font_Int **cur_fi, Evas_Script_Type script, const Eina_Unicode *text, int run_len); +EVAS_API void evas_common_font_ascent_descent_get(RGBA_Font *fn, const Evas_Text_Props *text_props, int *ascent, int *descent); + +EVAS_API void *evas_common_font_glyph_compress(void *data, int num_grays, int pixel_mode, int pitch_data, int w, int h, int *size_ret); +EVAS_API DATA8 *evas_common_font_glyph_uncompress(RGBA_Font_Glyph *fg, int *wret, int *hret); +EVAS_API int evas_common_font_glyph_search (RGBA_Font *fn, RGBA_Font_Int **fi_ret, Eina_Unicode gl, Eina_Unicode variation_sequence, uint32_t evas_font_search_options); void evas_common_font_load_init(void); void evas_common_font_load_shutdown(void); @@ -470,7 +446,4 @@ const char *evas_font_lang_normalize(const char *lang); void * evas_font_load(const Eina_List *font_paths, int hinting, Evas_Font_Description *fdesc, const char *source, Evas_Font_Size size, Efl_Text_Font_Bitmap_Scalable bitmap_scalable); void evas_font_load_hinting_set(void *font, int hinting); -#undef EAPI -#define EAPI - #endif /* _EVAS_FONT_H */ diff --git a/src/lib/evas/common/evas_font_compress.c b/src/lib/evas/common/evas_font_compress.c index 19d7219e0d..b017daecb2 100644 --- a/src/lib/evas/common/evas_font_compress.c +++ b/src/lib/evas/common/evas_font_compress.c @@ -402,7 +402,7 @@ decompress_bpp4(DATA8 *src, DATA8 *dst, int pitch, int w, int h) //-------------------------------------------------------------------------- //- GENERAL ---------------------------------------------------------------- //-------------------------------------------------------------------------- -EAPI void * +EVAS_API void * evas_common_font_glyph_compress(void *data, int num_grays, int pixel_mode, int pitch_data, int w, int h, int *size_ret) { @@ -438,7 +438,7 @@ evas_common_font_glyph_compress(void *data, int num_grays, int pixel_mode, // this decompresses a whole block of compressed font data back to 8bit // per pixels and deals with both 4bit RLE and 4bit packed encoding modes -EAPI DATA8 * +EVAS_API DATA8 * evas_common_font_glyph_uncompress(RGBA_Font_Glyph *fg, int *wret, int *hret) { RGBA_Font_Glyph_Out *fgo = fg->glyph_out; diff --git a/src/lib/evas/common/evas_font_draw.c b/src/lib/evas/common/evas_font_draw.c index 9792e9d408..93c493df9a 100644 --- a/src/lib/evas/common/evas_font_draw.c +++ b/src/lib/evas/common/evas_font_draw.c @@ -15,7 +15,7 @@ struct _Evas_Glyph FT_UInt idx; }; -EAPI void +EVAS_API void evas_common_font_draw_init(void) { } @@ -80,7 +80,7 @@ _evas_font_image_draw(void *context, void *surface, void *image, RGBA_Font_Glyph * and then for kerning we have to switch the order of the kerning query (as the prev * is on the right, and not on the left). */ -EAPI Eina_Bool +EVAS_API Eina_Bool evas_common_font_rgba_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, Evas_Glyph_Array *glyphs, RGBA_Gfx_Func func EINA_UNUSED, int ext_x, int ext_y, int ext_w, int ext_h, int im_w, int im_h EINA_UNUSED) @@ -209,7 +209,7 @@ evas_common_font_fonts_unref(Evas_Font_Array *array) free(array); } -EAPI void +EVAS_API void evas_common_font_draw_prepare(Evas_Text_Props *text_props) { RGBA_Font_Int *fi; @@ -301,7 +301,7 @@ error: eina_inarray_free(glyphs); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_common_font_draw_cb(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, Evas_Glyph_Array *glyphs, Evas_Common_Font_Draw_Cb cb) { int ext_x, ext_y, ext_w, ext_h; @@ -375,14 +375,14 @@ evas_common_font_draw_cb(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, E } } -EAPI void +EVAS_API void evas_common_font_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, Evas_Glyph_Array *glyphs) { evas_common_font_draw_cb(dst, dc, x, y, glyphs, evas_common_font_rgba_draw); } -EAPI void +EVAS_API void evas_common_font_draw_do(const Cutout_Rects *reuse, const Eina_Rectangle *clip, RGBA_Gfx_Func func, RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, const Evas_Text_Props *text_props) @@ -421,7 +421,7 @@ evas_common_font_draw_do(const Cutout_Rects *reuse, const Eina_Rectangle *clip, } } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_common_font_draw_prepare_cutout(Cutout_Rects **reuse, RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Gfx_Func *func) { int im_w, im_h; @@ -445,7 +445,7 @@ evas_common_font_draw_prepare_cutout(Cutout_Rects **reuse, RGBA_Image *dst, RGBA // this draws a compressed font glyph and decompresses on the fly as it // draws, saving memory bandwidth and providing speedups -EAPI void +EVAS_API void evas_common_font_glyph_draw(RGBA_Font_Glyph *fg, RGBA_Draw_Context *dc, RGBA_Image *dst_image, int dst_pitch, diff --git a/src/lib/evas/common/evas_font_draw.h b/src/lib/evas/common/evas_font_draw.h index 2fdfc36e12..cf31d6b385 100644 --- a/src/lib/evas/common/evas_font_draw.h +++ b/src/lib/evas/common/evas_font_draw.h @@ -6,13 +6,13 @@ /* draw */ typedef Eina_Bool (*Evas_Common_Font_Draw_Cb)(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, Evas_Glyph_Array *glyphs, RGBA_Gfx_Func func, int ext_x, int ext_y, int ext_w, int ext_h, int im_w, int im_h); -EAPI Eina_Bool evas_common_font_draw_cb (RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, Evas_Glyph_Array *glyphs, Evas_Common_Font_Draw_Cb cb); -EAPI void evas_common_font_draw (RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, Evas_Glyph_Array *glyphs); -EAPI Eina_Bool evas_common_font_rgba_draw (RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, Evas_Glyph_Array *glyphs, RGBA_Gfx_Func func, int ext_x, int ext_y, int ext_w, int ext_h, int im_w, int im_h); -EAPI void evas_common_font_draw_init (void); -EAPI void evas_common_font_draw_prepare (Evas_Text_Props *text_props); -EAPI void evas_common_font_draw_do (const Cutout_Rects *reuse, const Eina_Rectangle *clip, RGBA_Gfx_Func func, RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, const Evas_Text_Props *text_props); -EAPI Eina_Bool evas_common_font_draw_prepare_cutout (Cutout_Rects **reuse, RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Gfx_Func *func); -EAPI void evas_common_font_glyph_draw (RGBA_Font_Glyph *fg, RGBA_Draw_Context *dc, RGBA_Image *dst, int dst_pitch, int dx, int dy, int dw, int dh, int cx, int cy, int cw, int ch); +EVAS_API Eina_Bool evas_common_font_draw_cb (RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, Evas_Glyph_Array *glyphs, Evas_Common_Font_Draw_Cb cb); +EVAS_API void evas_common_font_draw (RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, Evas_Glyph_Array *glyphs); +EVAS_API Eina_Bool evas_common_font_rgba_draw (RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, Evas_Glyph_Array *glyphs, RGBA_Gfx_Func func, int ext_x, int ext_y, int ext_w, int ext_h, int im_w, int im_h); +EVAS_API void evas_common_font_draw_init (void); +EVAS_API void evas_common_font_draw_prepare (Evas_Text_Props *text_props); +EVAS_API void evas_common_font_draw_do (const Cutout_Rects *reuse, const Eina_Rectangle *clip, RGBA_Gfx_Func func, RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, const Evas_Text_Props *text_props); +EVAS_API Eina_Bool evas_common_font_draw_prepare_cutout (Cutout_Rects **reuse, RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Gfx_Func *func); +EVAS_API void evas_common_font_glyph_draw (RGBA_Font_Glyph *fg, RGBA_Draw_Context *dc, RGBA_Image *dst, int dst_pitch, int dx, int dy, int dw, int dh, int cx, int cy, int cw, int ch); #endif /* _EVAS_FONT_DRAW_H */ diff --git a/src/lib/evas/common/evas_font_load.c b/src/lib/evas/common/evas_font_load.c index 4aa6901257..355d1f9394 100644 --- a/src/lib/evas/common/evas_font_load.c +++ b/src/lib/evas/common/evas_font_load.c @@ -123,7 +123,7 @@ evas_common_font_load_shutdown(void) fonts_src = NULL; } -EAPI void +EVAS_API void evas_common_font_dpi_set(int dpi_h, int dpi_v) { if (dpi_v <= 0) dpi_v = dpi_h; @@ -131,7 +131,7 @@ evas_common_font_dpi_set(int dpi_h, int dpi_v) font_dpi_v = dpi_v; } -EAPI RGBA_Font_Source * +EVAS_API RGBA_Font_Source * evas_common_font_source_memory_load(const char *name, const void *data, int data_size) { int error; @@ -174,7 +174,7 @@ evas_common_font_source_memory_load(const char *name, const void *data, int data return fs; } -EAPI RGBA_Font_Source * +EVAS_API RGBA_Font_Source * evas_common_font_source_load(const char *name) { RGBA_Font_Source *fs; @@ -228,7 +228,7 @@ evas_common_font_source_reload(RGBA_Font_Source *fs) evas_common_font_source_load_complete(fs); } -EAPI int +EVAS_API int evas_common_font_source_load_complete(RGBA_Font_Source *fs) { int error; @@ -254,7 +254,7 @@ evas_common_font_source_load_complete(RGBA_Font_Source *fs) return error; } -EAPI RGBA_Font_Source * +EVAS_API RGBA_Font_Source * evas_common_font_source_find(const char *name) { RGBA_Font_Source *fs; @@ -269,7 +269,7 @@ evas_common_font_source_find(const char *name) return NULL; } -EAPI void +EVAS_API void evas_common_font_source_free(RGBA_Font_Source *fs) { fs->references--; @@ -278,7 +278,7 @@ evas_common_font_source_free(RGBA_Font_Source *fs) eina_hash_del(fonts_src, fs->name, fs); } -EAPI void +EVAS_API void evas_common_font_size_use(RGBA_Font *fn) { RGBA_Font_Int *fi; @@ -324,7 +324,7 @@ _evas_common_font_int_cache_init(RGBA_Font_Int *fi) LKI(fi->ft_mutex); } -EAPI RGBA_Font_Int * +EVAS_API RGBA_Font_Int * evas_common_font_int_memory_load(const char *source, const char *name, int size, const void *data, int data_size, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable) { RGBA_Font_Int *fi; @@ -367,7 +367,7 @@ _file_path_is_file_helper(const char *path) return 0; } -EAPI RGBA_Font_Int * +EVAS_API RGBA_Font_Int * evas_common_font_int_load(const char *name, int size, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable) @@ -396,7 +396,7 @@ evas_common_font_int_load(const char *name, int size, return fi; } -EAPI RGBA_Font_Int * +EVAS_API RGBA_Font_Int * evas_common_font_int_load_init(RGBA_Font_Int *fi) { fi->ft.size = NULL; @@ -405,7 +405,7 @@ evas_common_font_int_load_init(RGBA_Font_Int *fi) return fi; } -EAPI RGBA_Font_Int * +EVAS_API RGBA_Font_Int * evas_common_font_int_load_complete(RGBA_Font_Int *fi) { int val, dv; @@ -546,7 +546,7 @@ evas_common_font_int_load_complete(RGBA_Font_Int *fi) return fi; } -EAPI RGBA_Font * +EVAS_API RGBA_Font * evas_common_font_memory_load(const char *source, const char *name, int size, const void *data, int data_size, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable) { RGBA_Font *fn; @@ -580,7 +580,7 @@ evas_common_font_memory_load(const char *source, const char *name, int size, con // fn->(fi, fi, fi, ...) // fi->fs -EAPI RGBA_Font * +EVAS_API RGBA_Font * evas_common_font_load(const char *name, int size, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable) { RGBA_Font *fn; @@ -622,7 +622,7 @@ evas_common_font_load(const char *name, int size, Font_Rend_Flags wanted_rend, E return fn; } -EAPI RGBA_Font * +EVAS_API RGBA_Font * evas_common_font_add(RGBA_Font *fn, const char *name, int size, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable) { RGBA_Font_Int *fi; @@ -644,7 +644,7 @@ evas_common_font_add(RGBA_Font *fn, const char *name, int size, Font_Rend_Flags return NULL; } -EAPI RGBA_Font * +EVAS_API RGBA_Font * evas_common_font_memory_add(RGBA_Font *fn, const char *source, const char *name, int size, const void *data, int data_size, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable) { RGBA_Font_Int *fi; @@ -667,7 +667,7 @@ evas_common_font_memory_add(RGBA_Font *fn, const char *source, const char *name, return NULL; } -EAPI void +EVAS_API void evas_common_font_int_unref(RGBA_Font_Int *fi) { fi->references--; @@ -679,7 +679,7 @@ evas_common_font_int_unref(RGBA_Font_Int *fi) } } -EAPI void +EVAS_API void evas_common_font_free(RGBA_Font *fn) { Eina_List *l; @@ -701,7 +701,7 @@ evas_common_font_free(RGBA_Font *fn) free(fn); } -EAPI void +EVAS_API void evas_common_font_hinting_set(RGBA_Font *fn, Font_Hint_Flags hinting) { Eina_List *l; @@ -717,7 +717,7 @@ evas_common_font_hinting_set(RGBA_Font *fn, Font_Hint_Flags hinting) } } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_common_hinting_available(Font_Hint_Flags hinting) { switch (hinting) @@ -751,7 +751,7 @@ evas_common_hinting_available(Font_Hint_Flags hinting) return EINA_FALSE; } -EAPI RGBA_Font * +EVAS_API RGBA_Font * evas_common_font_memory_hinting_load(const char *source, const char *name, int size, const void *data, int data_size, Font_Hint_Flags hinting, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable) { RGBA_Font *fn; @@ -761,7 +761,7 @@ evas_common_font_memory_hinting_load(const char *source, const char *name, int s return fn; } -EAPI RGBA_Font * +EVAS_API RGBA_Font * evas_common_font_hinting_load(const char *name, int size, Font_Hint_Flags hinting, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable) { RGBA_Font *fn; @@ -771,7 +771,7 @@ evas_common_font_hinting_load(const char *name, int size, Font_Hint_Flags hintin return fn; } -EAPI RGBA_Font * +EVAS_API RGBA_Font * evas_common_font_hinting_add(RGBA_Font *fn, const char *name, int size, Font_Hint_Flags hinting, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable) { fn = evas_common_font_add(fn, name, size, wanted_rend, bitmap_scalable); @@ -779,7 +779,7 @@ evas_common_font_hinting_add(RGBA_Font *fn, const char *name, int size, Font_Hin return fn; } -EAPI RGBA_Font * +EVAS_API RGBA_Font * evas_common_font_memory_hinting_add(RGBA_Font *fn, const char *source, const char *name, int size, const void *data, int data_size, Font_Hint_Flags hinting, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable) { fn = evas_common_font_memory_add(fn, source, name, size, data, data_size, @@ -820,7 +820,7 @@ _evas_common_font_all_clear_cb(const Eina_Hash *hash EINA_UNUSED, const void *ke return 1; } -EAPI void +EVAS_API void evas_common_font_all_clear(void) { eina_hash_foreach(fonts, _evas_common_font_all_clear_cb, NULL); @@ -896,20 +896,20 @@ evas_common_font_int_reload(RGBA_Font_Int *fi) * we then check if the cache_useage size is larger than allowed * !If the cache is NOT too large we dont delete font_int * !If the cache is too large we really delete font_int */ -EAPI void +EVAS_API void evas_common_font_int_modify_cache_by(RGBA_Font_Int *fi, int dir) { font_cache_usage += dir * (sizeof(RGBA_Font) + fi->usage + sizeof(FT_FaceRec) + 16384); /* fudge values */ } -EAPI int +EVAS_API int evas_common_font_cache_get(void) { return font_cache; } -EAPI void +EVAS_API void evas_common_font_cache_set(int size) { font_cache = size; @@ -917,7 +917,7 @@ evas_common_font_cache_set(int size) evas_common_font_int_use_trim(); } -EAPI void +EVAS_API void evas_common_font_flush(void) { if (font_cache_usage < font_cache) return; @@ -934,7 +934,7 @@ evas_common_font_flush(void) /* We run this when the cache gets larger than allowed size * We check cache size each time a fi->references goes to 0 * PERFORMS: Find font_int(s) with references == 0 and delete them */ -EAPI void +EVAS_API void evas_common_font_flush_last(void) { RGBA_Font_Int *fi = NULL; @@ -945,7 +945,7 @@ evas_common_font_flush_last(void) eina_hash_del(fonts, fi, fi); } -EAPI RGBA_Font_Int * +EVAS_API RGBA_Font_Int * evas_common_font_int_find(const char *name, int size, Font_Rend_Flags wanted_rend, Efl_Text_Font_Bitmap_Scalable bitmap_scalable) @@ -1026,7 +1026,7 @@ _cb_hash_font_ext(const Eina_Hash *hash EINA_UNUSED, return EINA_TRUE; } -EAPI void +EVAS_API void evas_common_font_ext_clear(void) { eina_hash_foreach(fonts, _cb_hash_font_ext, NULL); diff --git a/src/lib/evas/common/evas_font_main.c b/src/lib/evas/common/evas_font_main.c index 50de0819bc..1af8fd2862 100644 --- a/src/lib/evas/common/evas_font_main.c +++ b/src/lib/evas/common/evas_font_main.c @@ -16,7 +16,7 @@ LK(lock_ot); // for evas bidi internal usage. int _evas_font_log_dom_global = -1; int _evas_font_texture_cache = -1; -EAPI void +EVAS_API void evas_common_font_init(void) { int error; @@ -57,7 +57,7 @@ evas_common_font_init(void) LKI(lock_ot); } -EAPI void +EVAS_API void evas_common_font_shutdown(void) { if (initialised < 1) return; @@ -77,7 +77,7 @@ evas_common_font_shutdown(void) eina_log_domain_unregister(_evas_font_log_dom_global); } -EAPI void +EVAS_API void evas_common_font_font_all_unload(void) { evas_common_font_all_clear(); @@ -99,7 +99,7 @@ evas_common_font_freetype_face_get(RGBA_Font *font) return fi->src->ft.face; } -EAPI int +EVAS_API int evas_common_font_instance_ascent_get(RGBA_Font_Int *fi) { int val; @@ -133,7 +133,7 @@ evas_common_font_instance_ascent_get(RGBA_Font_Int *fi) // return ret; } -EAPI int +EVAS_API int evas_common_font_instance_descent_get(RGBA_Font_Int *fi) { int val; @@ -162,7 +162,7 @@ evas_common_font_instance_descent_get(RGBA_Font_Int *fi) // return ret; } -EAPI int +EVAS_API int evas_common_font_instance_max_ascent_get(RGBA_Font_Int *fi) { int val, dv; @@ -197,7 +197,7 @@ evas_common_font_instance_max_ascent_get(RGBA_Font_Int *fi) return ret; } -EAPI int +EVAS_API int evas_common_font_instance_max_descent_get(RGBA_Font_Int *fi) { int val, dv; @@ -232,35 +232,35 @@ evas_common_font_instance_max_descent_get(RGBA_Font_Int *fi) return ret; } -EAPI int +EVAS_API int evas_common_font_ascent_get(RGBA_Font *fn) { // evas_common_font_size_use(fn); return evas_common_font_instance_ascent_get(fn->fonts->data); } -EAPI int +EVAS_API int evas_common_font_descent_get(RGBA_Font *fn) { // evas_common_font_size_use(fn); return evas_common_font_instance_descent_get(fn->fonts->data); } -EAPI int +EVAS_API int evas_common_font_max_ascent_get(RGBA_Font *fn) { // evas_common_font_size_use(fn); return evas_common_font_instance_max_ascent_get(fn->fonts->data); } -EAPI int +EVAS_API int evas_common_font_max_descent_get(RGBA_Font *fn) { // evas_common_font_size_use(fn); return evas_common_font_instance_max_descent_get(fn->fonts->data); } -EAPI int +EVAS_API int evas_common_font_get_line_advance(RGBA_Font *fn) { int val; @@ -297,7 +297,7 @@ evas_common_font_get_line_advance(RGBA_Font *fn) // return ret; } -EAPI int +EVAS_API int evas_common_font_instance_underline_position_get(RGBA_Font_Int *fi) { int position = 0; @@ -325,7 +325,7 @@ end: return position; } -EAPI int +EVAS_API int evas_common_font_instance_underline_thickness_get(RGBA_Font_Int *fi) { int thickness = 0; @@ -752,7 +752,7 @@ static void evas_font_glyph_load(RGBA_Font_Glyph *fg) return; } -EAPI RGBA_Font_Glyph * +EVAS_API RGBA_Font_Glyph * evas_common_font_int_cache_glyph_get(RGBA_Font_Int *fi, FT_UInt idx) { RGBA_Font_Glyph *fg; @@ -855,7 +855,7 @@ evas_common_font_int_cache_glyph_get(RGBA_Font_Int *fi, FT_UInt idx) return fg; } -EAPI void +EVAS_API void evas_font_data_cache_set(Evas_Font_Data_Cache options, int bytes) { if ((options & EVAS_FONT_DATA_CACHE_TEXTURE) == EVAS_FONT_DATA_CACHE_TEXTURE) @@ -865,7 +865,7 @@ evas_font_data_cache_set(Evas_Font_Data_Cache options, int bytes) } } -EAPI int +EVAS_API int evas_font_data_cache_get(Evas_Font_Data_Cache options) { if ((options & EVAS_FONT_DATA_CACHE_TEXTURE) == EVAS_FONT_DATA_CACHE_TEXTURE) @@ -874,7 +874,7 @@ evas_font_data_cache_get(Evas_Font_Data_Cache options) return -1; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_common_font_int_cache_glyph_render(RGBA_Font_Glyph *fg) { int size; @@ -981,7 +981,7 @@ struct _Font_Char_Index Eina_Unicode gl; }; -EAPI FT_UInt +EVAS_API FT_UInt evas_common_get_char_index(RGBA_Font_Int* fi, Eina_Unicode gl, Eina_Unicode variation_sequence) { static const unsigned short mapfix[] = @@ -1120,7 +1120,7 @@ evas_common_get_char_index(RGBA_Font_Int* fi, Eina_Unicode gl, Eina_Unicode vari * */ -EAPI int +EVAS_API int evas_common_font_glyph_search(RGBA_Font *fn, RGBA_Font_Int **fi_ret, Eina_Unicode gl, Eina_Unicode variation_sequence, uint32_t evas_font_search_options) { Eina_List *l; diff --git a/src/lib/evas/common/evas_font_ot.c b/src/lib/evas/common/evas_font_ot.c index 275727d8be..c2297a539c 100644 --- a/src/lib/evas/common/evas_font_ot.c +++ b/src/lib/evas/common/evas_font_ot.c @@ -122,7 +122,7 @@ _evas_script_to_harfbuzz[] = #ifdef OT_SUPPORT /* FIXME: doc. returns #items */ -EAPI int +EVAS_API int evas_common_font_ot_cluster_size_get(const Evas_Text_Props *props, size_t char_index) { int i; @@ -264,7 +264,7 @@ _evas_common_font_ot_shape(hb_buffer_t *buffer, RGBA_Font_Int *fi, Evas_Text_Pro } } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_common_font_ot_populate_text_props(const Eina_Unicode *text, Evas_Text_Props *props, int len, Evas_Text_Props_Mode mode, diff --git a/src/lib/evas/common/evas_font_ot.h b/src/lib/evas/common/evas_font_ot.h index 5e1906b419..31625a3c45 100644 --- a/src/lib/evas/common/evas_font_ot.h +++ b/src/lib/evas/common/evas_font_ot.h @@ -35,10 +35,10 @@ struct _Evas_Font_OT_Info #include "evas_font.h" #include "Evas.h" -EAPI int +EVAS_API int evas_common_font_ot_cluster_size_get(const Evas_Text_Props *props, size_t char_index); -EAPI Eina_Bool +EVAS_API Eina_Bool evas_common_font_ot_populate_text_props(const Eina_Unicode *text, Evas_Text_Props *props, int len, Evas_Text_Props_Mode mode, const char *lang); #endif diff --git a/src/lib/evas/common/evas_font_private.h b/src/lib/evas/common/evas_font_private.h index 4ff9a12ab1..b84b463801 100644 --- a/src/lib/evas/common/evas_font_private.h +++ b/src/lib/evas/common/evas_font_private.h @@ -4,7 +4,7 @@ #include "evas_font.h" /* macros needed to log message through eina_log */ -EAPI extern int _evas_font_log_dom_global; +EVAS_API extern int _evas_font_log_dom_global; #ifdef _EVAS_FONT_DEFAULT_LOG_DOM # undef _EVAS_FONT_DEFAULT_LOG_DOM #endif diff --git a/src/lib/evas/common/evas_font_query.c b/src/lib/evas/common/evas_font_query.c index a25c19c81e..b5fd5fbe14 100644 --- a/src/lib/evas/common/evas_font_query.c +++ b/src/lib/evas/common/evas_font_query.c @@ -16,7 +16,7 @@ * @param[in] run_let the current run len, i.e "search limit". * @return length of the run found. */ -EAPI int +EVAS_API int evas_common_font_query_run_font_end_get(RGBA_Font *fn, RGBA_Font_Int **script_fi, RGBA_Font_Int **cur_fi, Evas_Script_Type script EINA_UNUSED, const Eina_Unicode *text, int run_len) { RGBA_Font_Int *fi = NULL; @@ -170,7 +170,7 @@ evas_common_font_query_run_font_end_get(RGBA_Font *fn, RGBA_Font_Int **script_fi * @param[out] kerning the kerning calculated. * @return FALSE on error, TRUE on success. */ -EAPI int +EVAS_API int evas_common_font_query_kerning(RGBA_Font_Int *fi, FT_UInt left, FT_UInt right, int *kerning) { @@ -235,7 +235,7 @@ evas_common_font_query_kerning(RGBA_Font_Int *fi, FT_UInt left, FT_UInt right, * @param text_props the string object. * @return the calculated inset. */ -EAPI int +EVAS_API int evas_common_font_query_inset(RGBA_Font *fn EINA_UNUSED, const Evas_Text_Props *text_props) { if (!text_props->len) return 0; @@ -254,7 +254,7 @@ evas_common_font_query_inset(RGBA_Font *fn EINA_UNUSED, const Evas_Text_Props *t * * @see evas_common_font_query_inset() */ -EAPI int +EVAS_API int evas_common_font_query_right_inset(RGBA_Font *fn EINA_UNUSED, const Evas_Text_Props *text_props) { const Evas_Font_Glyph_Info *gli; @@ -287,7 +287,7 @@ evas_common_font_query_right_inset(RGBA_Font *fn EINA_UNUSED, const Evas_Text_Pr * @param[out] ascent the calculated ascent * @param[out] descent the calculated descent */ -EAPI void +EVAS_API void evas_common_font_ascent_descent_get(RGBA_Font *fn, const Evas_Text_Props *text_props, int *ascent, int *descent) { int asc = 0, desc = 0; @@ -328,7 +328,7 @@ evas_common_font_ascent_descent_get(RGBA_Font *fn, const Evas_Text_Props *text_p * @param[out] w the calculated width * @param[out] h the calculated height */ -EAPI void +EVAS_API void evas_common_font_query_size(RGBA_Font *fn, const Evas_Text_Props *text_props, int *w, int *h) { Evas_Coord ret_w = 0; @@ -392,7 +392,7 @@ evas_common_font_query_size(RGBA_Font *fn, const Evas_Text_Props *text_props, in * @param[out] h_adv the calculated horizontal advance. * @param[out] v_adv the calculated vertical advance. */ -EAPI void +EVAS_API void evas_common_font_query_advance(RGBA_Font *fn, const Evas_Text_Props *text_props, int *h_adv, int *v_adv) { Evas_Coord ret_adv = 0; @@ -441,7 +441,7 @@ evas_common_font_query_advance(RGBA_Font *fn, const Evas_Text_Props *text_props, * * @see evas_common_font_query_pen_coords() */ -EAPI int +EVAS_API int evas_common_font_query_char_coords(RGBA_Font *fn, const Evas_Text_Props *text_props, int pos, int *cx, int *cy, int *cw, int *ch) { int asc, desc; @@ -577,7 +577,7 @@ end: * * @see evas_common_font_query_char_coords() */ -EAPI int +EVAS_API int evas_common_font_query_pen_coords(RGBA_Font *fn, const Evas_Text_Props *text_props, int pos, int *cpen_x, int *cy, int *cadv, int *ch) { int asc, desc; @@ -702,7 +702,7 @@ end: * @param[out] ch the calculated height - CAN BE NULL * @return the position found, -1 on failure. */ -EAPI int +EVAS_API int evas_common_font_query_char_at_coords(RGBA_Font *fn, const Evas_Text_Props *text_props, int x, int y, int *cx, int *cy, int *cw, int *ch) { int asc, desc; @@ -815,7 +815,7 @@ end: * @param width_offset the additional width only for allowing glyph's. * @return the position found, -1 on failure. */ -EAPI int +EVAS_API int evas_common_font_query_last_up_to_pos(RGBA_Font *fn, const Evas_Text_Props *text_props, int x, int y, int width_offset) { int asc, desc; diff --git a/src/lib/evas/common/evas_image.h b/src/lib/evas/common/evas_image.h index 68f4686d59..c5a512dab6 100644 --- a/src/lib/evas/common/evas_image.h +++ b/src/lib/evas/common/evas_image.h @@ -2,62 +2,62 @@ #define _EVAS_IMAGE_H -EAPI void evas_common_image_init (void); -EAPI void evas_common_image_shutdown (void); +EVAS_API void evas_common_image_init (void); +EVAS_API void evas_common_image_shutdown (void); -EAPI void evas_common_image_image_all_unload (void); +EVAS_API void evas_common_image_image_all_unload (void); -EAPI void evas_common_rgba_pending_unloads_cleanup (void); -EAPI void evas_common_rgba_pending_unloads_remove (Image_Entry *ie); +EVAS_API void evas_common_rgba_pending_unloads_cleanup (void); +EVAS_API void evas_common_rgba_pending_unloads_remove (Image_Entry *ie); -EAPI void evas_common_rgba_image_free (Image_Entry *ie); -EAPI void evas_common_rgba_image_unload (Image_Entry *ie); -EAPI void evas_common_image_colorspace_normalize (RGBA_Image *im); -EAPI void evas_common_image_colorspace_dirty (RGBA_Image *im); -EAPI void evas_common_image_cache_free (void); /*2*/ -EAPI void evas_common_image_premul (Image_Entry *ie); /*2*/ -EAPI void evas_common_image_set_alpha_sparse (Image_Entry *ie); /*2*/ -/* EAPI RGBA_Image *evas_common_image_alpha_create (int w, int h); */ -/* EAPI RGBA_Image *evas_common_image_create (int w, int h); */ -EAPI RGBA_Image *evas_common_image_new (unsigned int w, unsigned int h, unsigned int alpha); -EAPI Evas_Cache_Image *evas_common_image_cache_get (void); +EVAS_API void evas_common_rgba_image_free (Image_Entry *ie); +EVAS_API void evas_common_rgba_image_unload (Image_Entry *ie); +EVAS_API void evas_common_image_colorspace_normalize (RGBA_Image *im); +EVAS_API void evas_common_image_colorspace_dirty (RGBA_Image *im); +EVAS_API void evas_common_image_cache_free (void); /*2*/ +EVAS_API void evas_common_image_premul (Image_Entry *ie); /*2*/ +EVAS_API void evas_common_image_set_alpha_sparse (Image_Entry *ie); /*2*/ +/* EVAS_API RGBA_Image *evas_common_image_alpha_create (int w, int h); */ +/* EVAS_API RGBA_Image *evas_common_image_create (int w, int h); */ +EVAS_API RGBA_Image *evas_common_image_new (unsigned int w, unsigned int h, unsigned int alpha); +EVAS_API Evas_Cache_Image *evas_common_image_cache_get (void); -EAPI void evas_common_image_set_cache (unsigned int size); -EAPI int evas_common_image_get_cache (void); +EVAS_API void evas_common_image_set_cache (unsigned int size); +EVAS_API int evas_common_image_get_cache (void); -EAPI RGBA_Image *evas_common_image_line_buffer_obtain (int len); -EAPI void evas_common_image_line_buffer_release (RGBA_Image *im); +EVAS_API RGBA_Image *evas_common_image_line_buffer_obtain (int len); +EVAS_API void evas_common_image_line_buffer_release (RGBA_Image *im); -EAPI RGBA_Image *evas_common_image_alpha_line_buffer_obtain (int len); -EAPI void evas_common_image_alpha_line_buffer_release (RGBA_Image *im); -EAPI void evas_common_image_alpha_line_buffer_free (RGBA_Image *im); +EVAS_API RGBA_Image *evas_common_image_alpha_line_buffer_obtain (int len); +EVAS_API void evas_common_image_alpha_line_buffer_release (RGBA_Image *im); +EVAS_API void evas_common_image_alpha_line_buffer_free (RGBA_Image *im); -EAPI RGBA_Image *evas_common_load_image_from_file (const char *file, const char *key, Evas_Image_Load_Opts *lo, int *error); -EAPI RGBA_Image *evas_common_load_image_from_mmap (Eina_File *f, const char *key, Evas_Image_Load_Opts *lo, int *error); -EAPI int evas_common_save_image_to_file (RGBA_Image *im, const char *file, const char *key, int quality, int compress, const char *encoding); +EVAS_API RGBA_Image *evas_common_load_image_from_file (const char *file, const char *key, Evas_Image_Load_Opts *lo, int *error); +EVAS_API RGBA_Image *evas_common_load_image_from_mmap (Eina_File *f, const char *key, Evas_Image_Load_Opts *lo, int *error); +EVAS_API int evas_common_save_image_to_file (RGBA_Image *im, const char *file, const char *key, int quality, int compress, const char *encoding); -EAPI void evas_common_rgba_image_scalecache_init(Image_Entry *ie); -EAPI void evas_common_rgba_image_scalecache_shutdown(Image_Entry *ie); -EAPI void evas_common_rgba_image_scalecache_size_set(unsigned int size); -EAPI unsigned int evas_common_rgba_image_scalecache_size_get(void); -EAPI void evas_common_rgba_image_scalecache_flush(void); -EAPI void evas_common_rgba_image_scalecache_dump(void); -EAPI void evas_common_rgba_image_scalecache_prune(void); -EAPI Eina_Bool +EVAS_API void evas_common_rgba_image_scalecache_init(Image_Entry *ie); +EVAS_API void evas_common_rgba_image_scalecache_shutdown(Image_Entry *ie); +EVAS_API void evas_common_rgba_image_scalecache_size_set(unsigned int size); +EVAS_API unsigned int evas_common_rgba_image_scalecache_size_get(void); +EVAS_API void evas_common_rgba_image_scalecache_flush(void); +EVAS_API void evas_common_rgba_image_scalecache_dump(void); +EVAS_API void evas_common_rgba_image_scalecache_prune(void); +EVAS_API Eina_Bool evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst, RGBA_Draw_Context *dc, int smooth, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); -EAPI void +EVAS_API void evas_common_rgba_image_scalecache_do(Image_Entry *ie, RGBA_Image *dst, RGBA_Draw_Context *dc, int smooth, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); -EAPI Eina_Bool +EVAS_API Eina_Bool evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie, RGBA_Image *dst, RGBA_Draw_Context *dc, int smooth, int src_region_x, int src_region_y, @@ -68,15 +68,15 @@ EAPI Eina_Bool Evas_Common_Scale_In_To_Out_Clip_Cb cb_smooth); -EAPI int evas_common_load_rgba_image_module_from_file (Image_Entry *im); -EAPI int evas_common_load_rgba_image_data_from_file (Image_Entry *im); -EAPI double evas_common_load_rgba_image_frame_duration_from_file(Image_Entry *im, int start_frame, int frame_num); +EVAS_API int evas_common_load_rgba_image_module_from_file (Image_Entry *im); +EVAS_API int evas_common_load_rgba_image_data_from_file (Image_Entry *im); +EVAS_API double evas_common_load_rgba_image_frame_duration_from_file(Image_Entry *im, int start_frame, int frame_num); void _evas_common_rgba_image_post_surface(Image_Entry *ie); -EAPI int _evas_common_rgba_image_surface_size(unsigned int w, unsigned int h, Evas_Colorspace cspace, /* inout */ int *l, int *r, int *t, int *b); -EAPI int _evas_common_rgba_image_data_offset(int rx, int ry, int rw, int rh, int plane, const RGBA_Image *im); -EAPI Eina_Bool _evas_common_rgba_image_plane_get(const RGBA_Image *im, int plane, Eina_Slice *slice); +EVAS_API int _evas_common_rgba_image_surface_size(unsigned int w, unsigned int h, Evas_Colorspace cspace, /* inout */ int *l, int *r, int *t, int *b); +EVAS_API int _evas_common_rgba_image_data_offset(int rx, int ry, int rw, int rh, int plane, const RGBA_Image *im); +EVAS_API Eina_Bool _evas_common_rgba_image_plane_get(const RGBA_Image *im, int plane, Eina_Slice *slice); -EAPI Eina_Bool evas_common_extension_can_load_get(const char *file); +EVAS_API Eina_Bool evas_common_extension_can_load_get(const char *file); #endif /* _EVAS_IMAGE_H */ diff --git a/src/lib/evas/common/evas_image_load.c b/src/lib/evas/common/evas_image_load.c index 96caa1627e..8ed04dda2e 100644 --- a/src/lib/evas/common/evas_image_load.c +++ b/src/lib/evas/common/evas_image_load.c @@ -266,7 +266,7 @@ _evas_image_foreach_loader(const Eina_Hash *hash EINA_UNUSED, const void *key EI return r; } -EAPI int +EVAS_API int evas_common_load_rgba_image_module_from_file(Image_Entry *ie) { const char *loader = NULL, *end; @@ -392,7 +392,7 @@ _timestamp_build(Image_Timestamp *tstamp, struct stat *st) #endif } -EAPI int +EVAS_API int evas_common_load_rgba_image_data_from_file(Image_Entry *ie) { void *pixels; @@ -495,7 +495,7 @@ end: return ret; } -EAPI double +EVAS_API double evas_common_load_rgba_image_frame_duration_from_file(Image_Entry *ie, const int start, const int frame_num) { Evas_Image_Load_Func *evas_image_load_func = NULL; @@ -512,7 +512,7 @@ evas_common_load_rgba_image_frame_duration_from_file(Image_Entry *ie, const int return -1; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_common_extension_can_load_get(const char *file) { unsigned int length; diff --git a/src/lib/evas/common/evas_image_main.c b/src/lib/evas/common/evas_image_main.c index dc8596a4d8..a94be359e3 100644 --- a/src/lib/evas/common/evas_image_main.c +++ b/src/lib/evas/common/evas_image_main.c @@ -1,5 +1,5 @@ #ifdef HAVE_CONFIG_H -# include "config.h" /* so that EAPI in Eet.h is correctly defined */ +# include "config.h" /* so that EVAS_API in Eet.h is correctly defined */ #endif #ifdef _WIN32 @@ -79,7 +79,7 @@ static const Evas_Cache_Image_Func _evas_common_image_func = NULL // _evas_common_rgba_image_debug }; -EAPI int +EVAS_API int _evas_common_rgba_image_surface_size(unsigned int w, unsigned int h, Evas_Colorspace cspace, /*inout*/int *l, int *r, int *t, int *b) @@ -152,7 +152,7 @@ _evas_common_rgba_image_surface_size(unsigned int w, unsigned int h, #undef ALIGN_TO_PAGE } -EAPI Eina_Bool +EVAS_API Eina_Bool _evas_common_rgba_image_plane_get(const RGBA_Image *im, int plane, Eina_Slice *slice) { @@ -306,7 +306,7 @@ _evas_common_rgba_image_plane_get(const RGBA_Image *im, int plane, } } -EAPI int +EVAS_API int _evas_common_rgba_image_data_offset(int rx, int ry, int rw, int rh, int plane, const RGBA_Image *im) { @@ -432,7 +432,7 @@ evas_common_rgba_image_surface_munmap(void *data, unsigned int w, unsigned int h #endif } -EAPI void +EVAS_API void evas_common_image_init(void) { if (!eci) eci = evas_cache_image_init(&_evas_common_image_func); @@ -441,7 +441,7 @@ evas_common_image_init(void) evas_common_scalecache_init(); } -EAPI void +EVAS_API void evas_common_image_shutdown(void) { if (--reference == 0) @@ -468,7 +468,7 @@ evas_common_image_shutdown(void) evas_common_scalecache_shutdown(); } -EAPI void +EVAS_API void evas_common_image_image_all_unload(void) { evas_common_rgba_image_scalecache_dump(); @@ -570,7 +570,7 @@ evas_common_rgba_image_unload_real(Image_Entry *ie) static Eina_List *pending_unloads = NULL; -EAPI void +EVAS_API void evas_common_rgba_pending_unloads_cleanup(void) { Image_Entry *ie; @@ -587,7 +587,7 @@ evas_common_rgba_pending_unloads_cleanup(void) } } -EAPI void +EVAS_API void evas_common_rgba_pending_unloads_remove(Image_Entry *ie) { if (!ie->need_unload) return; @@ -595,7 +595,7 @@ evas_common_rgba_pending_unloads_remove(Image_Entry *ie) pending_unloads = eina_list_remove(pending_unloads, ie); } -EAPI void +EVAS_API void evas_common_rgba_image_free(Image_Entry *ie) { if (ie->references > 0) return; @@ -628,7 +628,7 @@ surf_debug(void) } #endif -EAPI void +EVAS_API void evas_common_rgba_image_unload(Image_Entry *ie) { if (!ie->flags.loaded) return; @@ -886,7 +886,7 @@ evas_common_image_create(unsigned int w, unsigned int h) return im; } -EAPI RGBA_Image * +EVAS_API RGBA_Image * evas_common_image_alpha_create(unsigned int w, unsigned int h) { RGBA_Image *im; @@ -905,7 +905,7 @@ evas_common_image_alpha_create(unsigned int w, unsigned int h) return im; } -EAPI RGBA_Image * +EVAS_API RGBA_Image * evas_common_image_new(unsigned int w, unsigned int h, unsigned int alpha) { if (alpha) return evas_common_image_alpha_create(w, h); @@ -985,7 +985,7 @@ evas_common_image_colorspace_normalize(RGBA_Image *im) #endif } -EAPI void +EVAS_API void evas_common_image_colorspace_dirty(RGBA_Image *im) { im->cs.dirty = 1; @@ -1002,20 +1002,20 @@ evas_common_image_colorspace_dirty(RGBA_Image *im) #endif } -EAPI void +EVAS_API void evas_common_image_set_cache(unsigned int size) { if (eci) evas_cache_image_set(eci, size); } -EAPI int +EVAS_API int evas_common_image_get_cache(void) { return evas_cache_image_get(eci); } -EAPI RGBA_Image * +EVAS_API RGBA_Image * evas_common_load_image_from_file(const char *file, const char *key, Evas_Image_Load_Opts *lo, int *error) { @@ -1027,7 +1027,7 @@ evas_common_load_image_from_file(const char *file, const char *key, return (RGBA_Image *) evas_cache_image_request(eci, file, key, lo, error); } -EAPI RGBA_Image * +EVAS_API RGBA_Image * evas_common_load_image_from_mmap(Eina_File *f, const char *key, Evas_Image_Load_Opts *lo, int *error) { @@ -1039,19 +1039,19 @@ evas_common_load_image_from_mmap(Eina_File *f, const char *key, return (RGBA_Image *) evas_cache_image_mmap_request(eci, f, key, lo, error); } -EAPI void +EVAS_API void evas_common_image_cache_free(void) { evas_common_image_set_cache(0); } -EAPI Evas_Cache_Image* +EVAS_API Evas_Cache_Image* evas_common_image_cache_get(void) { return eci; } -EAPI RGBA_Image * +EVAS_API RGBA_Image * evas_common_image_line_buffer_obtain(int len) { if (len < 1) return NULL; @@ -1060,19 +1060,19 @@ evas_common_image_line_buffer_obtain(int len) return evas_common_image_create(len, 1); } -EAPI void +EVAS_API void evas_common_image_line_buffer_release(RGBA_Image *im) { _evas_common_rgba_image_delete(&im->cache_entry); } -EAPI void +EVAS_API void evas_common_image_line_buffer_free(RGBA_Image *im) { _evas_common_rgba_image_delete(&im->cache_entry); } -EAPI RGBA_Image * +EVAS_API RGBA_Image * evas_common_image_alpha_line_buffer_obtain(int len) { if (len < 1) return NULL; @@ -1081,13 +1081,13 @@ evas_common_image_alpha_line_buffer_obtain(int len) return evas_common_image_alpha_create(len, 1); } -EAPI void +EVAS_API void evas_common_image_alpha_line_buffer_release(RGBA_Image *im) { _evas_common_rgba_image_delete(&im->cache_entry); } -EAPI void +EVAS_API void evas_common_image_premul(Image_Entry *ie) { DATA32 nas = 0; @@ -1111,7 +1111,7 @@ evas_common_image_premul(Image_Entry *ie) ie->flags.alpha_sparse = 1; } -EAPI void +EVAS_API void evas_common_image_set_alpha_sparse(Image_Entry *ie) { DATA32 *s, *se; diff --git a/src/lib/evas/common/evas_image_scalecache.c b/src/lib/evas/common/evas_image_scalecache.c index c38c6ca462..709f0db41f 100644 --- a/src/lib/evas/common/evas_image_scalecache.c +++ b/src/lib/evas/common/evas_image_scalecache.c @@ -444,7 +444,7 @@ _cache_prune(Scaleitem *notsci, Eina_Bool copies_only) } #endif -EAPI void +EVAS_API void evas_common_rgba_image_scalecache_size_set(unsigned int size) { #ifdef SCALECACHE @@ -458,7 +458,7 @@ evas_common_rgba_image_scalecache_size_set(unsigned int size) #endif } -EAPI unsigned int +EVAS_API unsigned int evas_common_rgba_image_scalecache_size_get(void) { #ifdef SCALECACHE @@ -472,7 +472,7 @@ evas_common_rgba_image_scalecache_size_get(void) #endif } -EAPI void +EVAS_API void evas_common_rgba_image_scalecache_prune(void) { #ifdef SCALECACHE @@ -482,7 +482,7 @@ evas_common_rgba_image_scalecache_prune(void) #endif } -EAPI void +EVAS_API void evas_common_rgba_image_scalecache_dump(void) { #ifdef SCALECACHE @@ -496,7 +496,7 @@ evas_common_rgba_image_scalecache_dump(void) #endif } -EAPI void +EVAS_API void evas_common_rgba_image_scalecache_flush(void) { #ifdef SCALECACHE @@ -510,7 +510,7 @@ evas_common_rgba_image_scalecache_flush(void) #endif } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst EINA_UNUSED, RGBA_Draw_Context *dc, int smooth, int src_region_x, int src_region_y, @@ -644,7 +644,7 @@ evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst EINA_ //static int noscales = 0; #endif -EAPI Eina_Bool +EVAS_API Eina_Bool evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie, RGBA_Image *dst, RGBA_Draw_Context *dc, int smooth, int src_region_x, int src_region_y, @@ -953,7 +953,7 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie, RGBA_Image *dst, } -EAPI void +EVAS_API void evas_common_rgba_image_scalecache_do(Image_Entry *ie, RGBA_Image *dst, RGBA_Draw_Context *dc, int smooth, int src_region_x, int src_region_y, diff --git a/src/lib/evas/common/evas_line.h b/src/lib/evas/common/evas_line.h index a19dbd8529..d518f63939 100644 --- a/src/lib/evas/common/evas_line.h +++ b/src/lib/evas/common/evas_line.h @@ -3,14 +3,14 @@ typedef void (*Evas_Common_Line_Draw_Cb)(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x1, int y1); -EAPI void evas_common_line_point_draw (RGBA_Image *dst, int clip_x, int clip_y, int clip_w, int clip_h, DATA32 color, int render_op, int x, int y, RGBA_Image *mask_ie, int mask_x, int mask_y); +EVAS_API void evas_common_line_point_draw (RGBA_Image *dst, int clip_x, int clip_y, int clip_w, int clip_h, DATA32 color, int render_op, int x, int y, RGBA_Image *mask_ie, int mask_x, int mask_y); -EAPI void evas_common_line_init (void); +EVAS_API void evas_common_line_init (void); -EAPI void evas_common_line_draw_line (RGBA_Image *dst, int clip_x, int clip_y, int clip_w, int clip_h, DATA32 color, int render_op, int x1, int y1, int x2, int y2, RGBA_Image *mask_ie, int mask_x, int mask_y); -EAPI void evas_common_line_draw_line_aa (RGBA_Image *dst, int clip_x, int clip_y, int clip_w, int clip_h, DATA32 color, int render_op, int x1, int y1, int x2, int y2, RGBA_Image *mask_ie, int mask_x, int mask_y); -EAPI void evas_common_line_draw_cb (RGBA_Image *dst, RGBA_Draw_Context *dc, int x1, int y1, int x2, int y2, Evas_Common_Line_Draw_Cb cb); -EAPI void evas_common_line_draw (RGBA_Image *dst, RGBA_Draw_Context *dc, int x1, int y1, int x2, int y2); +EVAS_API void evas_common_line_draw_line (RGBA_Image *dst, int clip_x, int clip_y, int clip_w, int clip_h, DATA32 color, int render_op, int x1, int y1, int x2, int y2, RGBA_Image *mask_ie, int mask_x, int mask_y); +EVAS_API void evas_common_line_draw_line_aa (RGBA_Image *dst, int clip_x, int clip_y, int clip_w, int clip_h, DATA32 color, int render_op, int x1, int y1, int x2, int y2, RGBA_Image *mask_ie, int mask_x, int mask_y); +EVAS_API void evas_common_line_draw_cb (RGBA_Image *dst, RGBA_Draw_Context *dc, int x1, int y1, int x2, int y2, Evas_Common_Line_Draw_Cb cb); +EVAS_API void evas_common_line_draw (RGBA_Image *dst, RGBA_Draw_Context *dc, int x1, int y1, int x2, int y2); #endif /* _EVAS_LINE_H */ diff --git a/src/lib/evas/common/evas_line_main.c b/src/lib/evas/common/evas_line_main.c index a6970761e3..7c8072adfa 100644 --- a/src/lib/evas/common/evas_line_main.c +++ b/src/lib/evas/common/evas_line_main.c @@ -20,7 +20,7 @@ x1 = _tmp; \ } -EAPI void +EVAS_API void evas_common_line_init(void) { } @@ -69,7 +69,7 @@ _evas_draw_point(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y) } } -EAPI void +EVAS_API void evas_common_line_point_draw(RGBA_Image *dst, int clip_x, int clip_y, int clip_w, int clip_h, DATA32 color, int render_op, int x, int y, RGBA_Image *mask_ie, int mask_x, int mask_y) { Eina_Bool no_cuse; @@ -747,7 +747,7 @@ _draw_render_thread_simple_line(RGBA_Image *dst, int clip_x, int clip_y, int cli } } -EAPI void +EVAS_API void evas_common_line_draw_line(RGBA_Image *dst, int clip_x, int clip_y, int clip_w, int clip_h, DATA32 color, int render_op, int x0, int y0, int x1, int y1, RGBA_Image *mask_ie, int mask_x, int mask_y) { int px, py, x, y, prev_x, prev_y; @@ -1077,7 +1077,7 @@ next_y: } } -EAPI void +EVAS_API void evas_common_line_draw_line_aa(RGBA_Image *dst, int clip_x, int clip_y, int clip_w, int clip_h, DATA32 color, int render_op, int x0, int y0, int x1, int y1, RGBA_Image *mask_ie, int mask_x, int mask_y) { int px, py, x, y, prev_x, prev_y; @@ -1515,7 +1515,7 @@ next_x: } } -EAPI void +EVAS_API void evas_common_line_draw_cb(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x1, int y1, Evas_Common_Line_Draw_Cb cb) { int x, y, w, h; @@ -1573,7 +1573,7 @@ evas_common_line_draw_cb(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, dc->clip.h = ch; } -EAPI void +EVAS_API void evas_common_line_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x1, int y1) { Evas_Common_Line_Draw_Cb cb; diff --git a/src/lib/evas/common/evas_map_image.c b/src/lib/evas/common/evas_map_image.c index 24f070eb47..19eb165052 100644 --- a/src/lib/evas/common/evas_map_image.c +++ b/src/lib/evas/common/evas_map_image.c @@ -416,7 +416,7 @@ struct _RGBA_Map_Cutout RGBA_Map_Spans spans[1]; }; -EAPI void +EVAS_API void evas_common_map_rgba_clean(RGBA_Map *m) { RGBA_Map_Cutout *spans = m->engine_data; @@ -555,7 +555,7 @@ _evas_common_map_rgba_span(RGBA_Map_Spans *span, } } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_common_map_rgba_prepare(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Map *m) @@ -769,7 +769,7 @@ void evas_common_map_rgba_internal_neon(RGBA_Image *src, RGBA_Image *dst, RGBA_D } #endif -EAPI void +EVAS_API void evas_common_map_rgba_cb(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int npoints EINA_UNUSED, RGBA_Map_Point *p, @@ -812,7 +812,7 @@ evas_common_map_rgba_cb(RGBA_Image *src, RGBA_Image *dst, dc->clip.use = c; dc->clip.x = cx; dc->clip.y = cy; dc->clip.w = cw; dc->clip.h = ch; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_common_map_thread_rgba_cb(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Map *map, int smooth, int level, int offset, Evas_Common_Map_Thread_RGBA_Cb cb) { Cutout_Rect *r; @@ -856,7 +856,7 @@ evas_common_map_thread_rgba_cb(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Conte return ret; } -EAPI void +EVAS_API void evas_common_map_rgba(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int npoints, RGBA_Map_Point *p, @@ -889,7 +889,7 @@ evas_common_map_rgba(RGBA_Image *src, RGBA_Image *dst, evas_common_map_rgba_cb(src, dst, dc, npoints, p, smooth, level, cb); } -EAPI void +EVAS_API void evas_common_map_rgba_draw(RGBA_Image *src, RGBA_Image *dst, int clip_x, int clip_y, int clip_w, int clip_h, DATA32 mul_col, int render_op, int npoints EINA_UNUSED, RGBA_Map_Point *p, int smooth, Eina_Bool anti_alias, int level, RGBA_Image *mask_ie, int mask_x, int mask_y) { //The best quaility requsted. @@ -932,7 +932,7 @@ evas_common_map_rgba_draw(RGBA_Image *src, RGBA_Image *dst, int clip_x, int clip } } -EAPI void +EVAS_API void evas_common_map_rgba_do(const Eina_Rectangle *clip, RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, diff --git a/src/lib/evas/common/evas_map_image.h b/src/lib/evas/common/evas_map_image.h index 2bca78b0a2..3c46aec07c 100644 --- a/src/lib/evas/common/evas_map_image.h +++ b/src/lib/evas/common/evas_map_image.h @@ -4,34 +4,34 @@ typedef void (*Evas_Common_Map_RGBA_Cb) (RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Map_Point *p, int smooth, int level); typedef Eina_Bool (*Evas_Common_Map_Thread_RGBA_Cb) (RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Map *map, int smooth, int level, int offset); -EAPI void +EVAS_API void evas_common_map_rgba_cb(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int npoints, RGBA_Map_Point *points, int smooth, int level, Evas_Common_Map_RGBA_Cb cb); -EAPI Eina_Bool evas_common_map_thread_rgba_cb(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Map *map, int smooth, int level, int offset, Evas_Common_Map_Thread_RGBA_Cb cb); +EVAS_API Eina_Bool evas_common_map_thread_rgba_cb(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Map *map, int smooth, int level, int offset, Evas_Common_Map_Thread_RGBA_Cb cb); -EAPI void +EVAS_API void evas_common_map_rgba(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int npoints, RGBA_Map_Point *points, int smooth, int level); -EAPI void evas_common_map_rgba_draw(RGBA_Image *src, RGBA_Image *dst, int clip_x, int clip_y, int clip_w, int clip_h, DATA32 mul_col, int render_op, int npoints, RGBA_Map_Point *p, int smooth, Eina_Bool anti_alias, int level, RGBA_Image *mask_ie, int mask_x, int mask_y); +EVAS_API void evas_common_map_rgba_draw(RGBA_Image *src, RGBA_Image *dst, int clip_x, int clip_y, int clip_w, int clip_h, DATA32 mul_col, int render_op, int npoints, RGBA_Map_Point *p, int smooth, Eina_Bool anti_alias, int level, RGBA_Image *mask_ie, int mask_x, int mask_y); -EAPI Eina_Bool +EVAS_API Eina_Bool evas_common_map_rgba_prepare(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Map *m); -EAPI void +EVAS_API void evas_common_map_rgba_do(const Eina_Rectangle *clip, RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, const RGBA_Map *m, int smooth, int level); -EAPI void +EVAS_API void evas_common_map_rgba_clean(RGBA_Map *m); #endif /* _EVAS_MAP_H */ diff --git a/src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c b/src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c index 57562ce78d..97413575db 100644 --- a/src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c @@ -4,7 +4,7 @@ #include "Evas.h" #include "evas_common_types.h" -EAPI void evas_common_cpu_end_opt(void); +EXPORTAPI void evas_common_cpu_end_opt(void); #include "config.h" #include "evas_blend_ops.h" diff --git a/src/lib/evas/common/evas_pipe.c b/src/lib/evas/common/evas_pipe.c index 9cb62f4bce..3260752b9c 100644 --- a/src/lib/evas/common/evas_pipe.c +++ b/src/lib/evas/common/evas_pipe.c @@ -218,7 +218,7 @@ evas_common_pipe_begin(RGBA_Image *im) eina_barrier_wait(&(thbarrier[0])); } -EAPI void +EVAS_API void evas_common_pipe_flush(RGBA_Image *im) { if (!im->cache_entry.pipe) return; @@ -252,7 +252,7 @@ evas_common_pipe_flush(RGBA_Image *im) evas_common_pipe_free(im); } -EAPI void +EVAS_API void evas_common_pipe_free(RGBA_Image *im) { @@ -311,7 +311,7 @@ evas_common_pipe_rectangle_prepare(void *data, RGBA_Image *dst, RGBA_Pipe_Op *op return r; } -EAPI void +EVAS_API void evas_common_pipe_rectangle_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h) { RGBA_Pipe_Op *op; @@ -343,7 +343,7 @@ evas_common_pipe_line_draw_do(RGBA_Image *dst, const RGBA_Pipe_Op *op, const RGB op->op.line.x1, op->op.line.y1); } -EAPI void +EVAS_API void evas_common_pipe_line_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x1, int y1) { @@ -391,7 +391,7 @@ evas_common_pipe_poly_draw_do(RGBA_Image *dst, const RGBA_Pipe_Op *op, const RGB op->op.poly.points, op->op.poly.x, op->op.poly.y); } -EAPI void +EVAS_API void evas_common_pipe_poly_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Point *points, int x, int y) { @@ -457,7 +457,7 @@ evas_common_pipe_text_draw_prepare(void *data, RGBA_Image *dst, RGBA_Pipe_Op *op return r; } -EAPI void +EVAS_API void evas_common_pipe_text_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, Evas_Text_Props *intl_props) { @@ -561,7 +561,7 @@ evas_common_pipe_image_draw_do(RGBA_Image *dst, const RGBA_Pipe_Op *op, const RG #endif } -EAPI void +EVAS_API void evas_common_pipe_image_draw(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int smooth, int src_region_x, int src_region_y, @@ -629,7 +629,7 @@ evas_common_pipe_map_draw_prepare(void *data EINA_UNUSED, RGBA_Image *dst, RGBA_ return r; } -EAPI void +EVAS_API void evas_common_pipe_map_draw(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Map *m, int smooth, int level) @@ -777,7 +777,7 @@ evas_common_pipe_load_do(RGBA_Image *im) eina_barrier_wait(&(task_thbarrier[1])); } -EAPI void +EVAS_API void evas_common_pipe_image_load(RGBA_Image *im) { if (im->flags & RGBA_IMAGE_TODO_LOAD) @@ -799,7 +799,7 @@ evas_common_pipe_image_load(RGBA_Image *im) im->flags |= RGBA_IMAGE_TODO_LOAD; } -EAPI void +EVAS_API void evas_common_pipe_text_prepare(Evas_Text_Props *text_props) { RGBA_Font_Int *fi; @@ -827,7 +827,7 @@ evas_common_pipe_text_prepare(Evas_Text_Props *text_props) LKU(fi->ft_mutex); } -EAPI void +EVAS_API void evas_common_pipe_map_begin(RGBA_Image *root) { if (!evas_common_pipe_init()) @@ -850,7 +850,7 @@ evas_common_pipe_map_begin(RGBA_Image *root) } #endif -EAPI Eina_Bool +EVAS_API Eina_Bool evas_common_pipe_init(void) { #ifdef BUILD_PIPE_RENDER diff --git a/src/lib/evas/common/evas_pipe.h b/src/lib/evas/common/evas_pipe.h index a2fdb17279..3cf0e71356 100644 --- a/src/lib/evas/common/evas_pipe.h +++ b/src/lib/evas/common/evas_pipe.h @@ -8,20 +8,20 @@ * threadable */ -EAPI Eina_Bool evas_common_pipe_init(void); +EVAS_API Eina_Bool evas_common_pipe_init(void); -EAPI void evas_common_pipe_free(RGBA_Image *im); -EAPI void evas_common_pipe_rectangle_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h); -EAPI void evas_common_pipe_line_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x1, int y1); -EAPI void evas_common_pipe_poly_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Point *points, int x, int y); -EAPI void evas_common_pipe_text_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, Evas_Text_Props *intl_props); -EAPI void evas_common_pipe_text_prepare(Evas_Text_Props *text_props); -EAPI void evas_common_pipe_image_load(RGBA_Image *im); -EAPI void evas_common_pipe_image_draw(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int smooth, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); -EAPI void evas_common_pipe_map_begin(RGBA_Image *root); -EAPI void evas_common_pipe_map_draw(RGBA_Image *src, RGBA_Image *dst, +EVAS_API void evas_common_pipe_free(RGBA_Image *im); +EVAS_API void evas_common_pipe_rectangle_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h); +EVAS_API void evas_common_pipe_line_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x1, int y1); +EVAS_API void evas_common_pipe_poly_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Point *points, int x, int y); +EVAS_API void evas_common_pipe_text_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, Evas_Text_Props *intl_props); +EVAS_API void evas_common_pipe_text_prepare(Evas_Text_Props *text_props); +EVAS_API void evas_common_pipe_image_load(RGBA_Image *im); +EVAS_API void evas_common_pipe_image_draw(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int smooth, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); +EVAS_API void evas_common_pipe_map_begin(RGBA_Image *root); +EVAS_API void evas_common_pipe_map_draw(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Map *m, int smooth, int level); -EAPI void evas_common_pipe_flush(RGBA_Image *im); +EVAS_API void evas_common_pipe_flush(RGBA_Image *im); #endif /* _EVAS_PIPE_H */ diff --git a/src/lib/evas/common/evas_polygon.h b/src/lib/evas/common/evas_polygon.h index dee63c1ff6..7780aea4f9 100644 --- a/src/lib/evas/common/evas_polygon.h +++ b/src/lib/evas/common/evas_polygon.h @@ -2,13 +2,13 @@ #define _EVAS_POLYGON_H -EAPI void evas_common_polygon_init (void); +EVAS_API void evas_common_polygon_init (void); -EAPI RGBA_Polygon_Point *evas_common_polygon_point_add (RGBA_Polygon_Point *points, int x, int y); -EAPI RGBA_Polygon_Point *evas_common_polygon_points_clear (RGBA_Polygon_Point *points); -EAPI void evas_common_polygon_draw (RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Point *points, int x, int y); +EVAS_API RGBA_Polygon_Point *evas_common_polygon_point_add (RGBA_Polygon_Point *points, int x, int y); +EVAS_API RGBA_Polygon_Point *evas_common_polygon_points_clear (RGBA_Polygon_Point *points); +EVAS_API void evas_common_polygon_draw (RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Point *points, int x, int y); -EAPI void evas_common_polygon_rgba_draw (RGBA_Image *dst, int ext_x, int ext_y, int ext_w, int ext_h, DATA32 col, int render_op, RGBA_Polygon_Point *points, int x, int y, RGBA_Image *mask_ie, int mask_x, int mask_y); +EVAS_API void evas_common_polygon_rgba_draw (RGBA_Image *dst, int ext_x, int ext_y, int ext_w, int ext_h, DATA32 col, int render_op, RGBA_Polygon_Point *points, int x, int y, RGBA_Image *mask_ie, int mask_x, int mask_y); #endif /* _EVAS_POLYGON_H */ diff --git a/src/lib/evas/common/evas_polygon_main.c b/src/lib/evas/common/evas_polygon_main.c index 232a13c7ab..c867d3b390 100644 --- a/src/lib/evas/common/evas_polygon_main.c +++ b/src/lib/evas/common/evas_polygon_main.c @@ -65,12 +65,12 @@ struct _RGBA_Vertex num_active_edges++; \ } -EAPI void +EVAS_API void evas_common_polygon_init(void) { } -EAPI RGBA_Polygon_Point * +EVAS_API RGBA_Polygon_Point * evas_common_polygon_point_add(RGBA_Polygon_Point *points, int x, int y) { RGBA_Polygon_Point *pt; @@ -83,7 +83,7 @@ evas_common_polygon_point_add(RGBA_Polygon_Point *points, int x, int y) return points; } -EAPI RGBA_Polygon_Point * +EVAS_API RGBA_Polygon_Point * evas_common_polygon_points_clear(RGBA_Polygon_Point *points) { if (points) @@ -122,7 +122,7 @@ polygon_edge_sorter(const void *a, const void *b) return 1; } -EAPI void +EVAS_API void evas_common_polygon_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Point *points, int x, int y) { RGBA_Gfx_Func func; @@ -326,7 +326,7 @@ evas_common_polygon_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Po } } -EAPI void +EVAS_API void evas_common_polygon_rgba_draw(RGBA_Image *dst, int ext_x, int ext_y, int ext_w, int ext_h, DATA32 col, int render_op, RGBA_Polygon_Point *points, int x, int y, RGBA_Image *mask_ie, int mask_x, int mask_y) { RGBA_Gfx_Func func; diff --git a/src/lib/evas/common/evas_rectangle.h b/src/lib/evas/common/evas_rectangle.h index e79afd586d..935f67392a 100644 --- a/src/lib/evas/common/evas_rectangle.h +++ b/src/lib/evas/common/evas_rectangle.h @@ -3,14 +3,14 @@ typedef void (*Evas_Common_Rectangle_Draw_Cb)(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h); -EAPI void evas_common_rectangle_init (void); -EAPI void evas_common_rectangle_draw_cb (RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h, Evas_Common_Rectangle_Draw_Cb cb); -EAPI void evas_common_rectangle_draw (RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h); +EVAS_API void evas_common_rectangle_init (void); +EVAS_API void evas_common_rectangle_draw_cb (RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h, Evas_Common_Rectangle_Draw_Cb cb); +EVAS_API void evas_common_rectangle_draw (RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h); -EAPI void evas_common_rectangle_draw_do(const Cutout_Rects *reuse, const Eina_Rectangle *clip, RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h); -EAPI Eina_Bool evas_common_rectangle_draw_prepare(Cutout_Rects **reuse, const RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h); +EVAS_API void evas_common_rectangle_draw_do(const Cutout_Rects *reuse, const Eina_Rectangle *clip, RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h); +EVAS_API Eina_Bool evas_common_rectangle_draw_prepare(Cutout_Rects **reuse, const RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h); -EAPI void evas_common_rectangle_rgba_draw (RGBA_Image *dst, DATA32 color, int render_op, int x, int y, int w, int h, RGBA_Image *mask_ie, int mask_x, int mask_y); +EVAS_API void evas_common_rectangle_rgba_draw (RGBA_Image *dst, DATA32 color, int render_op, int x, int y, int w, int h, RGBA_Image *mask_ie, int mask_x, int mask_y); #endif /* _EVAS_RECTANGLE_H */ diff --git a/src/lib/evas/common/evas_rectangle_main.c b/src/lib/evas/common/evas_rectangle_main.c index 443e39fe61..ab372cfa76 100644 --- a/src/lib/evas/common/evas_rectangle_main.c +++ b/src/lib/evas/common/evas_rectangle_main.c @@ -4,12 +4,12 @@ static void rectangle_draw_internal(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h); -EAPI void +EVAS_API void evas_common_rectangle_init(void) { } -EAPI void +EVAS_API void evas_common_rectangle_draw_cb(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h, Evas_Common_Rectangle_Draw_Cb cb) { Cutout_Rect *r; @@ -48,13 +48,13 @@ evas_common_rectangle_draw_cb(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int dc->clip.use = c; dc->clip.x = cx; dc->clip.y = cy; dc->clip.w = cw; dc->clip.h = ch; } -EAPI void +EVAS_API void evas_common_rectangle_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h) { evas_common_rectangle_draw_cb(dst, dc, x, y, w, h, rectangle_draw_internal); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_common_rectangle_draw_prepare(Cutout_Rects **reuse, const RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h) { if ((w <= 0) || (h <= 0)) return EINA_FALSE; @@ -74,7 +74,7 @@ evas_common_rectangle_draw_prepare(Cutout_Rects **reuse, const RGBA_Image *dst, return EINA_TRUE; } -EAPI void +EVAS_API void evas_common_rectangle_draw_do(const Cutout_Rects *reuse, const Eina_Rectangle *clip, RGBA_Image *dst, RGBA_Draw_Context *dc, @@ -167,7 +167,7 @@ rectangle_draw_internal(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, in } } -EAPI void +EVAS_API void evas_common_rectangle_rgba_draw(RGBA_Image *dst, DATA32 color, int render_op, int x, int y, int w, int h, RGBA_Image *mask_ie, int mask_x, int mask_y) { RGBA_Gfx_Func func; diff --git a/src/lib/evas/common/evas_scale_main.c b/src/lib/evas/common/evas_scale_main.c index 06b20f30e6..9facea2b6e 100644 --- a/src/lib/evas/common/evas_scale_main.c +++ b/src/lib/evas/common/evas_scale_main.c @@ -1,12 +1,12 @@ #include "evas_common_private.h" #include "evas_private.h" -EAPI void +EVAS_API void evas_common_scale_init(void) { } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_common_scale_rgba_in_to_out_clip_prepare(Cutout_Rects **reuse, const RGBA_Image *src EINA_UNUSED, const RGBA_Image *dst, RGBA_Draw_Context *dc, @@ -31,7 +31,7 @@ evas_common_scale_rgba_in_to_out_clip_prepare(Cutout_Rects **reuse, const RGBA_I return EINA_TRUE; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_common_scale_rgba_in_to_out_clip_cb(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, diff --git a/src/lib/evas/common/evas_scale_main.h b/src/lib/evas/common/evas_scale_main.h index 76c46c8c70..85db6de0d8 100644 --- a/src/lib/evas/common/evas_scale_main.h +++ b/src/lib/evas/common/evas_scale_main.h @@ -3,20 +3,20 @@ typedef Eina_Bool (*Evas_Common_Scale_In_To_Out_Clip_Cb)(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); -EAPI void evas_common_scale_init (void); -EAPI void evas_common_scale_sample_init (void); -EAPI void evas_common_scale_sample_shutdown (void); +EVAS_API void evas_common_scale_init (void); +EVAS_API void evas_common_scale_sample_init (void); +EVAS_API void evas_common_scale_sample_shutdown (void); -EAPI Eina_Bool evas_common_scale_rgba_in_to_out_clip_cb (RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h, Evas_Common_Scale_In_To_Out_Clip_Cb cb); -EAPI Eina_Bool evas_common_scale_rgba_in_to_out_clip_smooth (RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); -EAPI Eina_Bool evas_common_scale_rgba_in_to_out_clip_sample (RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); +EVAS_API Eina_Bool evas_common_scale_rgba_in_to_out_clip_cb (RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h, Evas_Common_Scale_In_To_Out_Clip_Cb cb); +EVAS_API Eina_Bool evas_common_scale_rgba_in_to_out_clip_smooth (RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); +EVAS_API Eina_Bool evas_common_scale_rgba_in_to_out_clip_sample (RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); -EAPI void evas_common_rgba_image_scalecache_dump(void); +EVAS_API void evas_common_rgba_image_scalecache_dump(void); -EAPI void evas_common_scale_rgba_in_to_out_clip_sample_do (const Cutout_Rects *reuse, const Eina_Rectangle *clip, RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); -EAPI void evas_common_scale_rgba_in_to_out_clip_smooth_do (const Cutout_Rects *reuse, const Eina_Rectangle *clip, RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); -EAPI void evas_common_scale_rgba_sample_draw (RGBA_Image *src, RGBA_Image *dst, int dst_clip_x, int dst_clip_y, int dst_clip_w, int dst_clip_h, DATA32 mul_col, int render_op, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h, RGBA_Image *mask, int mask_x, int mask_y); -EAPI void evas_common_scale_rgba_smooth_draw (RGBA_Image *src, RGBA_Image *dst, int dst_clip_x, int dst_clip_y, int dst_clip_w, int dst_clip_h, DATA32 mul_col, int render_op, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h, RGBA_Image *mask_ie, int mask_x, int mask_y); -EAPI Eina_Bool evas_common_scale_rgba_in_to_out_clip_prepare (Cutout_Rects **reuse, const RGBA_Image *src, const RGBA_Image *dst, RGBA_Draw_Context *dc, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); +EVAS_API void evas_common_scale_rgba_in_to_out_clip_sample_do (const Cutout_Rects *reuse, const Eina_Rectangle *clip, RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); +EVAS_API void evas_common_scale_rgba_in_to_out_clip_smooth_do (const Cutout_Rects *reuse, const Eina_Rectangle *clip, RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); +EVAS_API void evas_common_scale_rgba_sample_draw (RGBA_Image *src, RGBA_Image *dst, int dst_clip_x, int dst_clip_y, int dst_clip_w, int dst_clip_h, DATA32 mul_col, int render_op, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h, RGBA_Image *mask, int mask_x, int mask_y); +EVAS_API void evas_common_scale_rgba_smooth_draw (RGBA_Image *src, RGBA_Image *dst, int dst_clip_x, int dst_clip_y, int dst_clip_w, int dst_clip_h, DATA32 mul_col, int render_op, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h, RGBA_Image *mask_ie, int mask_x, int mask_y); +EVAS_API Eina_Bool evas_common_scale_rgba_in_to_out_clip_prepare (Cutout_Rects **reuse, const RGBA_Image *src, const RGBA_Image *dst, RGBA_Draw_Context *dc, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); #endif /* _EVAS_SCALE_MAIN_H */ diff --git a/src/lib/evas/common/evas_scale_sample.c b/src/lib/evas/common/evas_scale_sample.c index cfd59726fc..cd59ed20b0 100644 --- a/src/lib/evas/common/evas_scale_sample.c +++ b/src/lib/evas/common/evas_scale_sample.c @@ -41,7 +41,7 @@ static Eina_Thread scaling_thread; static Eina_Thread_Queue *thread_queue = NULL; static Eina_Thread_Queue *main_queue = NULL; -EAPI Eina_Bool +EVAS_API Eina_Bool evas_common_scale_rgba_in_to_out_clip_sample(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, @@ -56,7 +56,7 @@ evas_common_scale_rgba_in_to_out_clip_sample(RGBA_Image *src, RGBA_Image *dst, scale_rgba_in_to_out_clip_sample_internal); } -EAPI void +EVAS_API void evas_common_scale_rgba_in_to_out_clip_sample_do(const Cutout_Rects *reuse, const Eina_Rectangle *clip, RGBA_Image *src, RGBA_Image *dst, @@ -197,7 +197,7 @@ _evas_common_scale_rgba_sample_scale_mask(int y, } } -EAPI void +EVAS_API void evas_common_scale_rgba_sample_draw(RGBA_Image *src, RGBA_Image *dst, int dst_clip_x, int dst_clip_y, int dst_clip_w, int dst_clip_h, DATA32 mul_col, int render_op, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h, RGBA_Image *mask_ie, int mask_x, int mask_y) { int x, y; @@ -806,7 +806,7 @@ evas_common_scale_sample_fork_reset(void *data EINA_UNUSED) } } -EAPI void +EVAS_API void evas_common_scale_sample_init(void) { if (eina_cpu_count() <= 2) return ; @@ -846,7 +846,7 @@ cleanup: if (main_queue) eina_thread_queue_free(main_queue); } -EAPI void +EVAS_API void evas_common_scale_sample_shutdown(void) { Evas_Scale_Msg *msg; diff --git a/src/lib/evas/common/evas_scale_smooth.c b/src/lib/evas/common/evas_scale_smooth.c index 781c13d1df..f5d8e93cd5 100644 --- a/src/lib/evas/common/evas_scale_smooth.c +++ b/src/lib/evas/common/evas_scale_smooth.c @@ -235,7 +235,7 @@ evas_common_scale_rgba_in_to_out_clip_smooth_c(RGBA_Image *src, RGBA_Image *dst, return EINA_TRUE; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_common_scale_rgba_in_to_out_clip_smooth(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, @@ -267,7 +267,7 @@ evas_common_scale_rgba_in_to_out_clip_smooth(RGBA_Image *src, RGBA_Image *dst, cb); } -EAPI void +EVAS_API void evas_common_scale_rgba_smooth_draw(RGBA_Image *src, RGBA_Image *dst, int dst_clip_x, int dst_clip_y, int dst_clip_w, int dst_clip_h, DATA32 mul_col, int render_op, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h, RGBA_Image *mask_ie, int mask_x, int mask_y) { #ifdef BUILD_MMX @@ -304,7 +304,7 @@ evas_common_scale_rgba_smooth_draw(RGBA_Image *src, RGBA_Image *dst, int dst_cli mask_ie, mask_x, mask_y); } -EAPI void +EVAS_API void evas_common_scale_rgba_in_to_out_clip_smooth_do(const Cutout_Rects *reuse, const Eina_Rectangle *clip, RGBA_Image *src, RGBA_Image *dst, diff --git a/src/lib/evas/common/evas_scale_smooth.h b/src/lib/evas/common/evas_scale_smooth.h index faa8ad3bd2..d43d03fcf9 100644 --- a/src/lib/evas/common/evas_scale_smooth.h +++ b/src/lib/evas/common/evas_scale_smooth.h @@ -1,7 +1,7 @@ #ifndef _EVAS_SCALE_SMOOTH_H #define _EVAS_SCALE_SMOOTH_H -EAPI Eina_Bool evas_common_scale_rgba_in_to_out_clip_smooth_mmx (RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); -EAPI Eina_Bool evas_common_scale_rgba_in_to_out_clip_smooth_c (RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); +EVAS_API Eina_Bool evas_common_scale_rgba_in_to_out_clip_smooth_mmx (RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); +EVAS_API Eina_Bool evas_common_scale_rgba_in_to_out_clip_smooth_c (RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); #endif /* _EVAS_SCALE_SMOOTH_H */ diff --git a/src/lib/evas/common/evas_scale_span.c b/src/lib/evas/common/evas_scale_span.c index 8e5bf6c0bd..616dba3ba8 100644 --- a/src/lib/evas/common/evas_scale_span.c +++ b/src/lib/evas/common/evas_scale_span.c @@ -447,35 +447,35 @@ evas_common_scale_clip_a8_span_(DATA32 *src EINA_UNUSED, DATA8 *mask, int src_le } } -EAPI void +EVAS_API void evas_common_scale_rgba_span(DATA32 *src, DATA8 *mask, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir) { evas_common_scale_rgba_span_(src, mask, src_len, mul_col, dst, dst_len, dir); evas_common_cpu_end_opt(); } -EAPI void +EVAS_API void evas_common_scale_rgba_a8_span(DATA32 *src, DATA8 *mask, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir) { evas_common_scale_rgba_a8_span_(src, mask, src_len, mul_col, dst, dst_len, dir); evas_common_cpu_end_opt(); } -EAPI void +EVAS_API void evas_common_scale_a8_span(DATA32 *src, DATA8 *mask, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir) { evas_common_scale_a8_span_(src, mask, src_len, mul_col, dst, dst_len, dir); evas_common_cpu_end_opt(); } -EAPI void +EVAS_API void evas_common_scale_clip_a8_span(DATA32 *src, DATA8 *mask, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir) { evas_common_scale_clip_a8_span_(src, mask, src_len, mul_col, dst, dst_len, dir); evas_common_cpu_end_opt(); } -EAPI void +EVAS_API void evas_common_scale_hsva_span(DATA32 *src, DATA8 *mask EINA_UNUSED, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir) { int mul = 0, step = 1; @@ -558,7 +558,7 @@ evas_common_scale_hsva_span(DATA32 *src, DATA8 *mask EINA_UNUSED, int src_len, D } } -EAPI void +EVAS_API void evas_common_scale_hsva_a8_span(DATA32 *src, DATA8 *mask, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir) { int mul = 0, step = 1; diff --git a/src/lib/evas/common/evas_scale_span.h b/src/lib/evas/common/evas_scale_span.h index 874c594b57..90e263f13c 100644 --- a/src/lib/evas/common/evas_scale_span.h +++ b/src/lib/evas/common/evas_scale_span.h @@ -2,13 +2,13 @@ #define _EVAS_SCALE_SPAN_H -EAPI void evas_common_scale_rgba_span (DATA32 *src, DATA8 *mask, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir); -EAPI void evas_common_scale_rgba_a8_span (DATA32 *src, DATA8 *mask, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir); -EAPI void evas_common_scale_a8_span (DATA32 *src, DATA8 *mask, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir); -EAPI void evas_common_scale_clip_a8_span (DATA32 *src, DATA8 *mask, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir); +EVAS_API void evas_common_scale_rgba_span (DATA32 *src, DATA8 *mask, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir); +EVAS_API void evas_common_scale_rgba_a8_span (DATA32 *src, DATA8 *mask, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir); +EVAS_API void evas_common_scale_a8_span (DATA32 *src, DATA8 *mask, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir); +EVAS_API void evas_common_scale_clip_a8_span (DATA32 *src, DATA8 *mask, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir); -EAPI void evas_common_scale_hsva_span (DATA32 *src, DATA8 *mask, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir); -EAPI void evas_common_scale_hsva_a8_span (DATA32 *src, DATA8 *mask, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir); +EVAS_API void evas_common_scale_hsva_span (DATA32 *src, DATA8 *mask, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir); +EVAS_API void evas_common_scale_hsva_a8_span (DATA32 *src, DATA8 *mask, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir); #endif /* _EVAS_SCALE_SPAN_H */ diff --git a/src/lib/evas/common/evas_text_utils.c b/src/lib/evas/common/evas_text_utils.c index b109e9b98a..99a9c3e3b3 100644 --- a/src/lib/evas/common/evas_text_utils.c +++ b/src/lib/evas/common/evas_text_utils.c @@ -858,7 +858,7 @@ _evas_common_text_props_cluster_move(const Evas_Text_Props *props, int pos, return pos; } -EAPI int +EVAS_API int evas_common_text_props_cluster_next(const Evas_Text_Props *props, int pos) { Eina_Bool right; @@ -867,7 +867,7 @@ evas_common_text_props_cluster_next(const Evas_Text_Props *props, int pos) return _evas_common_text_props_cluster_move(props, pos, right); } -EAPI int +EVAS_API int evas_common_text_props_cluster_prev(const Evas_Text_Props *props, int pos) { Eina_Bool right; @@ -877,7 +877,7 @@ evas_common_text_props_cluster_prev(const Evas_Text_Props *props, int pos) } /* Returns the index of the logical char in the props. */ -EAPI int +EVAS_API int evas_common_text_props_index_find(const Evas_Text_Props *props, int _cutoff) { #ifdef OT_SUPPORT @@ -973,7 +973,7 @@ evas_common_text_props_index_find(const Evas_Text_Props *props, int _cutoff) /* Won't work in the middle of ligatures, assumes cutoff < len. * Also won't work in the middle of indic words, should handle that in a * smart way. */ -EAPI Eina_Bool +EVAS_API Eina_Bool evas_common_text_props_split(Evas_Text_Props *base, Evas_Text_Props *ext, int _cutoff) { @@ -1027,7 +1027,7 @@ evas_common_text_props_split(Evas_Text_Props *base, } /* Won't work in the middle of ligatures */ -EAPI void +EVAS_API void evas_common_text_props_merge(Evas_Text_Props *item1, const Evas_Text_Props *item2) { @@ -1222,7 +1222,7 @@ _content_create_regular(RGBA_Font_Int *fi, const Eina_Unicode *text, } #endif -EAPI Eina_Bool +EVAS_API Eina_Bool evas_common_text_props_content_create(void *_fi, const Eina_Unicode *text, Evas_Text_Props *text_props, const Evas_BiDi_Paragraph_Props *par_props, size_t par_pos, int len, Evas_Text_Props_Mode mode, const char *lang) diff --git a/src/lib/evas/common/evas_text_utils.h b/src/lib/evas/common/evas_text_utils.h index 09c51e0c5e..faec37435e 100644 --- a/src/lib/evas/common/evas_text_utils.h +++ b/src/lib/evas/common/evas_text_utils.h @@ -153,7 +153,7 @@ evas_common_text_props_bidi_set(Evas_Text_Props *props, void evas_common_text_props_script_set(Evas_Text_Props *props, Evas_Script_Type scr); -EAPI Eina_Bool +EVAS_API Eina_Bool evas_common_text_props_content_create(void *_fi, const Eina_Unicode *text, Evas_Text_Props *text_props, const Evas_BiDi_Paragraph_Props *par_props, size_t par_pos, int len, Evas_Text_Props_Mode mode, const char *lang); @@ -171,19 +171,19 @@ evas_common_text_props_content_nofree_unref(Evas_Text_Props *props); void evas_common_text_props_content_unref(Evas_Text_Props *props); -EAPI int +EVAS_API int evas_common_text_props_cluster_next(const Evas_Text_Props *props, int pos); -EAPI int +EVAS_API int evas_common_text_props_cluster_prev(const Evas_Text_Props *props, int pos); -EAPI int +EVAS_API int evas_common_text_props_index_find(const Evas_Text_Props *props, int _cutoff); -EAPI Eina_Bool +EVAS_API Eina_Bool evas_common_text_props_split(Evas_Text_Props *base, Evas_Text_Props *ext, int cutoff); -EAPI void +EVAS_API void evas_common_text_props_merge(Evas_Text_Props *item1, const Evas_Text_Props *item2); /* Common to Textblock and Filters */ diff --git a/src/lib/evas/common/evas_thread_render.c b/src/lib/evas/common/evas_thread_render.c index 324f6e9e3b..ded914e93d 100644 --- a/src/lib/evas/common/evas_thread_render.c +++ b/src/lib/evas/common/evas_thread_render.c @@ -37,7 +37,7 @@ _evas_thread_queue_fence(void *data) eina_lock_release(&f->lock); } -EAPI void +EVAS_API void evas_thread_queue_wait(void) { struct fence_stuff f; @@ -103,13 +103,13 @@ out: eina_lock_release(&evas_thread_queue_lock); } -EAPI void +EVAS_API void evas_thread_cmd_enqueue(Evas_Thread_Command_Cb cb, void *data) { evas_thread_queue_append(cb, data, EINA_FALSE); } -EAPI void +EVAS_API void evas_thread_queue_flush(Evas_Thread_Command_Cb cb, void *data) { evas_thread_queue_append(cb, data, EINA_TRUE); diff --git a/src/lib/evas/common/evas_tiler.c b/src/lib/evas/common/evas_tiler.c index 0157446d39..a9a367420b 100644 --- a/src/lib/evas/common/evas_tiler.c +++ b/src/lib/evas/common/evas_tiler.c @@ -5,12 +5,12 @@ #ifdef NEWTILER #define MAXREG 24 -EAPI void +EVAS_API void evas_common_tilebuf_init(void) { } -EAPI Tilebuf * +EVAS_API Tilebuf * evas_common_tilebuf_new(int w, int h) { Tilebuf *tb = malloc(sizeof(Tilebuf)); @@ -20,51 +20,51 @@ evas_common_tilebuf_new(int w, int h) return tb; } -EAPI void +EVAS_API void evas_common_tilebuf_free(Tilebuf *tb) { region_free(tb->region); free(tb); } -EAPI void +EVAS_API void evas_common_tilebuf_set_tile_size(Tilebuf *tb EINA_UNUSED, int tw EINA_UNUSED, int th EINA_UNUSED) { } -EAPI void +EVAS_API void evas_common_tilebuf_get_tile_size(Tilebuf *tb EINA_UNUSED, int *tw, int *th) { if (tw) *tw = 1; if (th) *th = 1; } -EAPI void +EVAS_API void evas_common_tilebuf_tile_strict_set(Tilebuf *tb EINA_UNUSED, Eina_Bool strict EINA_UNUSED) { } -EAPI int +EVAS_API int evas_common_tilebuf_add_redraw(Tilebuf *tb, int x, int y, int w, int h) { region_rect_add(tb->region, x, y, w, h); return 1; } -EAPI int +EVAS_API int evas_common_tilebuf_del_redraw(Tilebuf *tb, int x, int y, int w, int h) { region_rect_del(tb->region, x, y, w, h); return 1; } -EAPI int +EVAS_API int evas_common_tilebuf_add_motion_vector(Tilebuf *tb EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, int dx EINA_UNUSED, int dy EINA_UNUSED, int alpha EINA_UNUSED) { return 0; } -EAPI void +EVAS_API void evas_common_tilebuf_clear(Tilebuf *tb) { region_free(tb->region); @@ -95,7 +95,7 @@ _region_round(Region *region, int tsize) return region2; } -EAPI Tilebuf_Rect * +EVAS_API Tilebuf_Rect * evas_common_tilebuf_get_render_rects(Tilebuf *tb) { Tilebuf_Rect *rects = NULL, *r, *rend, *rbuf; @@ -169,7 +169,7 @@ evas_common_tilebuf_get_render_rects(Tilebuf *tb) return rects; } -EAPI void +EVAS_API void evas_common_tilebuf_free_render_rects(Tilebuf_Rect *rects) { free(rects); @@ -857,12 +857,12 @@ _add_redraw(list_t *rects, int x, int y, int w, int h, int fuzz) ///////////////////////////////////////////////////////////////// -EAPI void +EVAS_API void evas_common_tilebuf_init(void) { } -EAPI Tilebuf * +EVAS_API Tilebuf * evas_common_tilebuf_new(int w, int h) { Tilebuf *tb; @@ -876,7 +876,7 @@ evas_common_tilebuf_new(int w, int h) return tb; } -EAPI void +EVAS_API void evas_common_tilebuf_free(Tilebuf *tb) { rect_list_clear(&tb->rects); @@ -884,27 +884,27 @@ evas_common_tilebuf_free(Tilebuf *tb) free(tb); } -EAPI void +EVAS_API void evas_common_tilebuf_set_tile_size(Tilebuf *tb, int tw, int th) { tb->tile_size.w = tw; tb->tile_size.h = th; } -EAPI void +EVAS_API void evas_common_tilebuf_get_tile_size(Tilebuf *tb, int *tw, int *th) { if (tw) *tw = tb->tile_size.w; if (th) *th = tb->tile_size.h; } -EAPI void +EVAS_API void evas_common_tilebuf_tile_strict_set(Tilebuf *tb, Eina_Bool strict) { tb->strict_tiles = strict; } -EAPI int +EVAS_API int evas_common_tilebuf_add_redraw(Tilebuf *tb, int x, int y, int w, int h) { if ((w <= 0) || (h <= 0)) return 0; @@ -919,7 +919,7 @@ evas_common_tilebuf_add_redraw(Tilebuf *tb, int x, int y, int w, int h) return _add_redraw(&tb->rects, x, y, w, h, FUZZ * FUZZ); } -EAPI int +EVAS_API int evas_common_tilebuf_del_redraw(Tilebuf *tb, int x, int y, int w, int h) { rect_t r; @@ -940,13 +940,13 @@ evas_common_tilebuf_del_redraw(Tilebuf *tb, int x, int y, int w, int h) return 0; } -EAPI int +EVAS_API int evas_common_tilebuf_add_motion_vector(Tilebuf *tb EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, int dx EINA_UNUSED, int dy EINA_UNUSED, int alpha EINA_UNUSED) { return 0; } -EAPI void +EVAS_API void evas_common_tilebuf_clear(Tilebuf *tb) { tb->prev_add.x = tb->prev_add.y = tb->prev_add.w = tb->prev_add.h = 0; @@ -955,7 +955,7 @@ evas_common_tilebuf_clear(Tilebuf *tb) tb->need_merge = 0; } -EAPI Tilebuf_Rect * +EVAS_API Tilebuf_Rect * evas_common_tilebuf_get_render_rects(Tilebuf *tb) { list_node_t *n; @@ -1080,7 +1080,7 @@ evas_common_tilebuf_get_render_rects(Tilebuf *tb) return rects; } -EAPI void +EVAS_API void evas_common_tilebuf_free_render_rects(Tilebuf_Rect *rects) { free(rects); diff --git a/src/lib/evas/common/language/evas_bidi_utils.c b/src/lib/evas/common/language/evas_bidi_utils.c index ab1afeb1f7..61750d5d76 100644 --- a/src/lib/evas/common/language/evas_bidi_utils.c +++ b/src/lib/evas/common/language/evas_bidi_utils.c @@ -105,7 +105,7 @@ evas_bidi_is_rtl_str(const Eina_Unicode *str) * @param len the length of th string. * @return #EINA_TRUE on success, #EINA_FALSE otherwise. */ -EAPI Eina_Bool +EVAS_API Eina_Bool evas_bidi_shape_string(Eina_Unicode *eina_ustr, const Evas_BiDi_Paragraph_Props *bidi_props, size_t start, size_t len) { FriBidiChar *ustr, *base_ustr = NULL; diff --git a/src/lib/evas/common/language/evas_bidi_utils.h b/src/lib/evas/common/language/evas_bidi_utils.h index 9b4ea68d64..a2af78e856 100644 --- a/src/lib/evas/common/language/evas_bidi_utils.h +++ b/src/lib/evas/common/language/evas_bidi_utils.h @@ -151,7 +151,7 @@ evas_bidi_paragraph_props_get(const Eina_Unicode *eina_ustr, size_t len, int *se void evas_bidi_props_copy_and_ref(const Evas_BiDi_Props *src, Evas_BiDi_Props *dst); -EAPI Eina_Bool +EVAS_API Eina_Bool evas_bidi_shape_string(Eina_Unicode *eina_ustr, const Evas_BiDi_Paragraph_Props *bidi_props, size_t start, size_t len); void |