From ec72116e3ced0fddd626fdaf9ea35cbfc38bce11 Mon Sep 17 00:00:00 2001 From: sebastid Date: Wed, 6 Sep 2006 07:28:46 +0000 Subject: [PATCH] Exported module functions must be EAPI SVN revision: 25524 --- legacy/evas/src/modules/engines/buffer/evas_engine.c | 6 +++--- legacy/evas/src/modules/engines/cairo_x11/evas_engine.c | 8 +++++--- legacy/evas/src/modules/engines/fb/evas_engine.c | 6 +++--- legacy/evas/src/modules/engines/gl_x11/evas_engine.c | 8 +++++--- .../src/modules/engines/software_generic/evas_engine.c | 6 +++--- .../src/modules/engines/software_qtopia/evas_engine.c | 6 +++--- .../evas/src/modules/engines/software_x11/evas_engine.c | 7 ++++--- .../evas/src/modules/engines/software_xcb/evas_engine.c | 6 +++--- .../evas/src/modules/engines/xrender_x11/evas_engine.c | 6 +++--- .../evas/src/modules/engines/xrender_xcb/evas_engine.c | 6 +++--- .../evas/src/modules/loaders/edb/evas_image_load_edb.c | 8 +++++--- .../evas/src/modules/loaders/eet/evas_image_load_eet.c | 8 +++++--- .../evas/src/modules/loaders/gif/evas_image_load_gif.c | 8 +++++--- .../evas/src/modules/loaders/jpeg/evas_image_load_jpeg.c | 8 +++++--- .../evas/src/modules/loaders/png/evas_image_load_png.c | 8 +++++--- .../evas/src/modules/loaders/svg/evas_image_load_svg.c | 8 +++++--- .../evas/src/modules/loaders/tiff/evas_image_load_tiff.c | 8 +++++--- .../evas/src/modules/loaders/xpm/evas_image_load_xpm.c | 9 +++++---- legacy/evas/src/modules/savers/edb/evas_image_save_edb.c | 8 +++++--- legacy/evas/src/modules/savers/eet/evas_image_save_eet.c | 8 +++++--- .../evas/src/modules/savers/jpeg/evas_image_save_jpeg.c | 8 +++++--- legacy/evas/src/modules/savers/png/evas_image_save_png.c | 8 +++++--- .../evas/src/modules/savers/tiff/evas_image_save_tiff.c | 8 +++++--- 23 files changed, 100 insertions(+), 70 deletions(-) diff --git a/legacy/evas/src/modules/engines/buffer/evas_engine.c b/legacy/evas/src/modules/engines/buffer/evas_engine.c index 25acfb56c6..aa09321793 100644 --- a/legacy/evas/src/modules/engines/buffer/evas_engine.c +++ b/legacy/evas/src/modules/engines/buffer/evas_engine.c @@ -307,7 +307,7 @@ eng_output_flush(void *data) } /* module advertising code */ -int +EAPI int module_open(Evas_Module *em) { if (!em) return 0; @@ -334,12 +334,12 @@ module_open(Evas_Module *em) return 1; } -void +EAPI void module_close(void) { } -Evas_Module_Api evas_modapi = +EAPI Evas_Module_Api evas_modapi = { EVAS_MODULE_API_VERSION, EVAS_MODULE_TYPE_ENGINE, diff --git a/legacy/evas/src/modules/engines/cairo_x11/evas_engine.c b/legacy/evas/src/modules/engines/cairo_x11/evas_engine.c index acdf404fcd..bbfd1cc5d6 100644 --- a/legacy/evas/src/modules/engines/cairo_x11/evas_engine.c +++ b/legacy/evas/src/modules/engines/cairo_x11/evas_engine.c @@ -1386,19 +1386,21 @@ eng_font_hinting_can_hint(void *data, int hinting) re = (Render_Engine *)data; } -int module_open(Evas_Module *em) +EAPI int +module_open(Evas_Module *em) { if (!em) return 0; em->functions = (void *)(&eng_func); return 1; } -void module_close(void) +EAPI void +module_close(void) { } -Evas_Module_Api evas_modapi = +EAPI Evas_Module_Api evas_modapi = { EVAS_MODULE_API_VERSION, EVAS_MODULE_TYPE_ENGINE, diff --git a/legacy/evas/src/modules/engines/fb/evas_engine.c b/legacy/evas/src/modules/engines/fb/evas_engine.c index d4272c13e5..444c0836f7 100644 --- a/legacy/evas/src/modules/engines/fb/evas_engine.c +++ b/legacy/evas/src/modules/engines/fb/evas_engine.c @@ -231,7 +231,7 @@ eng_output_flush(void *data) } /* module advertising code */ -int +EAPI int module_open(Evas_Module *em) { if (!em) return 0; @@ -258,12 +258,12 @@ module_open(Evas_Module *em) return 1; } -void +EAPI void module_close(void) { } -Evas_Module_Api evas_modapi = +EAPI Evas_Module_Api evas_modapi = { EVAS_MODULE_API_VERSION, EVAS_MODULE_TYPE_ENGINE, diff --git a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c index 0c8d524bdc..91b5e61680 100644 --- a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c +++ b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c @@ -1347,19 +1347,21 @@ eng_best_depth_get(Display *disp, int screen) return _evas_gl_x11_vi->depth; } -int module_open(Evas_Module *em) +EAPI int +module_open(Evas_Module *em) { if (!em) return 0; em->functions = (void *)(&eng_func); return 1; } -void module_close(void) +EAPI void +module_close(void) { } -Evas_Module_Api evas_modapi = +EAPI Evas_Module_Api evas_modapi = { EVAS_MODULE_API_VERSION, EVAS_MODULE_TYPE_ENGINE, diff --git a/legacy/evas/src/modules/engines/software_generic/evas_engine.c b/legacy/evas/src/modules/engines/software_generic/evas_engine.c index 9b7c2a52eb..17d35f4c36 100644 --- a/legacy/evas/src/modules/engines/software_generic/evas_engine.c +++ b/legacy/evas/src/modules/engines/software_generic/evas_engine.c @@ -782,7 +782,7 @@ static Evas_Func func = ***** */ -int +EAPI int module_open(Evas_Module *em) { if (!em) return 0; @@ -790,12 +790,12 @@ module_open(Evas_Module *em) return 1; } -void +EAPI void module_close(void) { } -Evas_Module_Api evas_modapi = +EAPI Evas_Module_Api evas_modapi = { EVAS_MODULE_API_VERSION, EVAS_MODULE_TYPE_ENGINE, diff --git a/legacy/evas/src/modules/engines/software_qtopia/evas_engine.c b/legacy/evas/src/modules/engines/software_qtopia/evas_engine.c index 00eab0dda6..e3fc2d5557 100644 --- a/legacy/evas/src/modules/engines/software_qtopia/evas_engine.c +++ b/legacy/evas/src/modules/engines/software_qtopia/evas_engine.c @@ -246,7 +246,7 @@ eng_output_flush(void *data) } /* module advertising code */ -int +EAPI int module_open(Evas_Module *em) { if (!em) return 0; @@ -273,12 +273,12 @@ module_open(Evas_Module *em) return 1; } -void +EAPI void module_close(void) { } -Evas_Module_Api evas_modapi = +EAPI Evas_Module_Api evas_modapi = { EVAS_MODULE_API_VERSION, EVAS_MODULE_TYPE_ENGINE, diff --git a/legacy/evas/src/modules/engines/software_x11/evas_engine.c b/legacy/evas/src/modules/engines/software_x11/evas_engine.c index 9ac5eabb9b..115abd4660 100644 --- a/legacy/evas/src/modules/engines/software_x11/evas_engine.c +++ b/legacy/evas/src/modules/engines/software_x11/evas_engine.c @@ -372,7 +372,7 @@ eng_output_flush(void *data) /* module advertising code */ -int +EAPI int module_open(Evas_Module *em) { if (!em) return 0; @@ -399,11 +399,12 @@ module_open(Evas_Module *em) return 1; } -void module_close(void) +EAPI void +module_close(void) { } -Evas_Module_Api evas_modapi = +EAPI Evas_Module_Api evas_modapi = { EVAS_MODULE_API_VERSION, EVAS_MODULE_TYPE_ENGINE, diff --git a/legacy/evas/src/modules/engines/software_xcb/evas_engine.c b/legacy/evas/src/modules/engines/software_xcb/evas_engine.c index 01169e0ab3..64aef4630e 100644 --- a/legacy/evas/src/modules/engines/software_xcb/evas_engine.c +++ b/legacy/evas/src/modules/engines/software_xcb/evas_engine.c @@ -415,7 +415,7 @@ eng_output_flush(void *data) } /* module advertising code */ -int +EAPI int module_open(Evas_Module *em) { if (!em) return 0; @@ -442,12 +442,12 @@ module_open(Evas_Module *em) return 1; } -void +EAPI void module_close(void) { } -Evas_Module_Api evas_modapi = +EAPI Evas_Module_Api evas_modapi = { EVAS_MODULE_API_VERSION, EVAS_MODULE_TYPE_ENGINE, diff --git a/legacy/evas/src/modules/engines/xrender_x11/evas_engine.c b/legacy/evas/src/modules/engines/xrender_x11/evas_engine.c index 527517dee9..2dc61f285e 100644 --- a/legacy/evas/src/modules/engines/xrender_x11/evas_engine.c +++ b/legacy/evas/src/modules/engines/xrender_x11/evas_engine.c @@ -761,7 +761,7 @@ eng_font_draw(void *data, void *context, void *surface, void *font, int x, int y } /* module advertising code */ -int +EAPI int module_open(Evas_Module *em) { if (!em) return 0; @@ -824,12 +824,12 @@ module_open(Evas_Module *em) return 1; } -void +EAPI void module_close(void) { } -Evas_Module_Api evas_modapi = +EAPI Evas_Module_Api evas_modapi = { EVAS_MODULE_API_VERSION, EVAS_MODULE_TYPE_ENGINE, diff --git a/legacy/evas/src/modules/engines/xrender_xcb/evas_engine.c b/legacy/evas/src/modules/engines/xrender_xcb/evas_engine.c index 4d96965af1..aad3bdc012 100644 --- a/legacy/evas/src/modules/engines/xrender_xcb/evas_engine.c +++ b/legacy/evas/src/modules/engines/xrender_xcb/evas_engine.c @@ -771,7 +771,7 @@ eng_font_draw(void *data, void *context, void *surface, void *font, int x, int y } /* module advertising code */ -int +EAPI int module_open(Evas_Module *em) { if (!em) return 0; @@ -834,12 +834,12 @@ module_open(Evas_Module *em) return 1; } -void +EAPI void module_close(void) { } -Evas_Module_Api evas_modapi = +EAPI Evas_Module_Api evas_modapi = { EVAS_MODULE_API_VERSION, EVAS_MODULE_TYPE_ENGINE, diff --git a/legacy/evas/src/modules/loaders/edb/evas_image_load_edb.c b/legacy/evas/src/modules/loaders/edb/evas_image_load_edb.c index 78b932793e..156fb87317 100644 --- a/legacy/evas/src/modules/loaders/edb/evas_image_load_edb.c +++ b/legacy/evas/src/modules/loaders/edb/evas_image_load_edb.c @@ -193,19 +193,21 @@ evas_image_load_file_data_edb(RGBA_Image *im, const char *file, const char *key) return 1; } -int module_open(Evas_Module *em) +EAPI int +module_open(Evas_Module *em) { if (!em) return 0; em->functions = (void *)(&evas_image_load_edb_func); return 1; } -void module_close(void) +EAPI void +module_close(void) { } -Evas_Module_Api evas_modapi = +EAPI Evas_Module_Api evas_modapi = { EVAS_MODULE_API_VERSION, EVAS_MODULE_TYPE_IMAGE_LOADER, diff --git a/legacy/evas/src/modules/loaders/eet/evas_image_load_eet.c b/legacy/evas/src/modules/loaders/eet/evas_image_load_eet.c index 8065be9b74..7e2e217d16 100644 --- a/legacy/evas/src/modules/loaders/eet/evas_image_load_eet.c +++ b/legacy/evas/src/modules/loaders/eet/evas_image_load_eet.c @@ -93,19 +93,21 @@ evas_image_load_file_data_eet(RGBA_Image *im, const char *file, const char *key) return 1; } -int module_open(Evas_Module *em) +EAPI int +module_open(Evas_Module *em) { if (!em) return 0; em->functions = (void *)(&evas_image_load_eet_func); return 1; } -void module_close(void) +EAPI void +module_close(void) { } -Evas_Module_Api evas_modapi = +EAPI Evas_Module_Api evas_modapi = { EVAS_MODULE_API_VERSION, EVAS_MODULE_TYPE_IMAGE_LOADER, diff --git a/legacy/evas/src/modules/loaders/gif/evas_image_load_gif.c b/legacy/evas/src/modules/loaders/gif/evas_image_load_gif.c index b624e68ef8..83fbb5c4f3 100644 --- a/legacy/evas/src/modules/loaders/gif/evas_image_load_gif.c +++ b/legacy/evas/src/modules/loaders/gif/evas_image_load_gif.c @@ -296,19 +296,21 @@ evas_image_load_file_data_gif(RGBA_Image *im, const char *file, const char *key) return 1; } -int module_open(Evas_Module *em) +EAPI int +module_open(Evas_Module *em) { if (!em) return 0; em->functions = (void *)(&evas_image_load_gif_func); return 1; } -void module_close(void) +EAPI void +module_close(void) { } -Evas_Module_Api evas_modapi = +EAPI Evas_Module_Api evas_modapi = { EVAS_MODULE_API_VERSION, EVAS_MODULE_TYPE_IMAGE_LOADER, diff --git a/legacy/evas/src/modules/loaders/jpeg/evas_image_load_jpeg.c b/legacy/evas/src/modules/loaders/jpeg/evas_image_load_jpeg.c index 00f7f88705..3ae2fbd154 100644 --- a/legacy/evas/src/modules/loaders/jpeg/evas_image_load_jpeg.c +++ b/legacy/evas/src/modules/loaders/jpeg/evas_image_load_jpeg.c @@ -413,19 +413,21 @@ evas_image_load_file_data_jpeg(RGBA_Image *im, const char *file, const char *key key = 0; } -int module_open(Evas_Module *em) +EAPI int +module_open(Evas_Module *em) { if (!em) return 0; em->functions = (void *)(&evas_image_load_jpeg_func); return 1; } -void module_close(void) +EAPI void +module_close(void) { } -Evas_Module_Api evas_modapi = +EAPI Evas_Module_Api evas_modapi = { EVAS_MODULE_API_VERSION, EVAS_MODULE_TYPE_IMAGE_LOADER, diff --git a/legacy/evas/src/modules/loaders/png/evas_image_load_png.c b/legacy/evas/src/modules/loaders/png/evas_image_load_png.c index 1b50269a84..3df9c8b41f 100644 --- a/legacy/evas/src/modules/loaders/png/evas_image_load_png.c +++ b/legacy/evas/src/modules/loaders/png/evas_image_load_png.c @@ -202,19 +202,21 @@ evas_image_load_file_data_png(RGBA_Image *im, const char *file, const char *key) key = 0; } -int module_open(Evas_Module *em) +EAPI int +module_open(Evas_Module *em) { if (!em) return 0; em->functions = (void *)(&evas_image_load_png_func); return 1; } -void module_close(void) +EAPI void +module_close(void) { } -Evas_Module_Api evas_modapi = +EAPI Evas_Module_Api evas_modapi = { EVAS_MODULE_API_VERSION, EVAS_MODULE_TYPE_IMAGE_LOADER, diff --git a/legacy/evas/src/modules/loaders/svg/evas_image_load_svg.c b/legacy/evas/src/modules/loaders/svg/evas_image_load_svg.c index 212d23f27b..4119c7ad2b 100644 --- a/legacy/evas/src/modules/loaders/svg/evas_image_load_svg.c +++ b/legacy/evas/src/modules/loaders/svg/evas_image_load_svg.c @@ -221,7 +221,8 @@ evas_image_load_file_data_svg(RGBA_Image *im, const char *file, const char *key) return 1; } -int module_open(Evas_Module *em) +EAPI int +module_open(Evas_Module *em) { if (!em) return 0; em->functions = (void *)(&evas_image_load_svg_func); @@ -230,13 +231,14 @@ int module_open(Evas_Module *em) return 1; } -void module_close(void) +EAPI void +module_close(void) { rsvg_term(); rsvg_initialized = 0; } -Evas_Module_Api evas_modapi = +EAPI Evas_Module_Api evas_modapi = { EVAS_MODULE_API_VERSION, EVAS_MODULE_TYPE_IMAGE_LOADER, diff --git a/legacy/evas/src/modules/loaders/tiff/evas_image_load_tiff.c b/legacy/evas/src/modules/loaders/tiff/evas_image_load_tiff.c index 82d4b614d8..f8744374b7 100644 --- a/legacy/evas/src/modules/loaders/tiff/evas_image_load_tiff.c +++ b/legacy/evas/src/modules/loaders/tiff/evas_image_load_tiff.c @@ -316,19 +316,21 @@ evas_image_load_file_data_tiff(RGBA_Image *im, const char *file, const char *key return 1; } -int module_open(Evas_Module *em) +EAPI int +module_open(Evas_Module *em) { if (!em) return 0; em->functions = (void *)(&evas_image_load_tiff_func); return 1; } -void module_close(void) +EAPI void +module_close(void) { } -Evas_Module_Api evas_modapi = +EAPI Evas_Module_Api evas_modapi = { EVAS_MODULE_API_VERSION, EVAS_MODULE_TYPE_IMAGE_LOADER, diff --git a/legacy/evas/src/modules/loaders/xpm/evas_image_load_xpm.c b/legacy/evas/src/modules/loaders/xpm/evas_image_load_xpm.c index cd69690b17..88b7dc1523 100644 --- a/legacy/evas/src/modules/loaders/xpm/evas_image_load_xpm.c +++ b/legacy/evas/src/modules/loaders/xpm/evas_image_load_xpm.c @@ -111,7 +111,6 @@ evas_image_load_file_xpm(RGBA_Image *im, const char *file, const char *key, int short lookup[128 - 32][128 - 32]; float per = 0.0, per_inc = 0.0; - int last_per = 0, last_y = 0; int count, pixels; if (!file) return 0; @@ -684,19 +683,21 @@ evas_image_load_file_data_xpm(RGBA_Image *im, const char *file, const char *key) -int module_open(Evas_Module *em) +EAPI int +module_open(Evas_Module *em) { if (!em) return 0; em->functions = (void *)(&evas_image_load_xpm_func); return 1; } -void module_close(void) +EAPI void +module_close(void) { } -Evas_Module_Api evas_modapi = +EAPI Evas_Module_Api evas_modapi = { EVAS_MODULE_API_VERSION, EVAS_MODULE_TYPE_IMAGE_LOADER, diff --git a/legacy/evas/src/modules/savers/edb/evas_image_save_edb.c b/legacy/evas/src/modules/savers/edb/evas_image_save_edb.c index 196098bfd3..b0e8fcaca7 100644 --- a/legacy/evas/src/modules/savers/edb/evas_image_save_edb.c +++ b/legacy/evas/src/modules/savers/edb/evas_image_save_edb.c @@ -18,19 +18,21 @@ evas_image_save_file_edb(RGBA_Image *im, const char *file, const char *key, int return 0; } -int module_open(Evas_Module *em) +EAPI int +module_open(Evas_Module *em) { if (!em) return 0; em->functions = (void *)(&evas_image_save_edb_func); return 1; } -void module_close(void) +EAPI void +module_close(void) { } -Evas_Module_Api evas_modapi = +EAPI Evas_Module_Api evas_modapi = { EVAS_MODULE_API_VERSION, EVAS_MODULE_TYPE_IMAGE_SAVER, diff --git a/legacy/evas/src/modules/savers/eet/evas_image_save_eet.c b/legacy/evas/src/modules/savers/eet/evas_image_save_eet.c index 991ec7ac39..8f2166025a 100644 --- a/legacy/evas/src/modules/savers/eet/evas_image_save_eet.c +++ b/legacy/evas/src/modules/savers/eet/evas_image_save_eet.c @@ -32,19 +32,21 @@ evas_image_save_file_eet(RGBA_Image *im, const char *file, const char *key, int return ok; } -int module_open(Evas_Module *em) +EAPI int +module_open(Evas_Module *em) { if (!em) return 0; em->functions = (void *)(&evas_image_save_eet_func); return 1; } -void module_close(void) +EAPI void +module_close(void) { } -Evas_Module_Api evas_modapi = +EAPI Evas_Module_Api evas_modapi = { EVAS_MODULE_API_VERSION, EVAS_MODULE_TYPE_IMAGE_SAVER, diff --git a/legacy/evas/src/modules/savers/jpeg/evas_image_save_jpeg.c b/legacy/evas/src/modules/savers/jpeg/evas_image_save_jpeg.c index 9a89981549..99db5aa336 100644 --- a/legacy/evas/src/modules/savers/jpeg/evas_image_save_jpeg.c +++ b/legacy/evas/src/modules/savers/jpeg/evas_image_save_jpeg.c @@ -117,19 +117,21 @@ int evas_image_save_file_jpeg(RGBA_Image *im, const char *file, const char *key, return save_image_jpeg(im, file, quality); } -int module_open(Evas_Module *em) +EAPI int +module_open(Evas_Module *em) { if (!em) return 0; em->functions = (void *)(&evas_image_save_jpeg_func); return 1; } -void module_close(void) +EAPI void +module_close(void) { } -Evas_Module_Api evas_modapi = +EAPI Evas_Module_Api evas_modapi = { EVAS_MODULE_API_VERSION, EVAS_MODULE_TYPE_IMAGE_SAVER, diff --git a/legacy/evas/src/modules/savers/png/evas_image_save_png.c b/legacy/evas/src/modules/savers/png/evas_image_save_png.c index b0553aed72..c5fb2dbc5a 100644 --- a/legacy/evas/src/modules/savers/png/evas_image_save_png.c +++ b/legacy/evas/src/modules/savers/png/evas_image_save_png.c @@ -125,19 +125,21 @@ int evas_image_save_file_png(RGBA_Image *im, const char *file, const char *key, return save_image_png(im, file, compress, 0); } -int module_open(Evas_Module *em) +EAPI int +module_open(Evas_Module *em) { if (!em) return 0; em->functions = (void *)(&evas_image_save_png_func); return 1; } -void module_close(void) +EAPI void +module_close(void) { } -Evas_Module_Api evas_modapi = +EAPI Evas_Module_Api evas_modapi = { EVAS_MODULE_API_VERSION, EVAS_MODULE_TYPE_IMAGE_SAVER, diff --git a/legacy/evas/src/modules/savers/tiff/evas_image_save_tiff.c b/legacy/evas/src/modules/savers/tiff/evas_image_save_tiff.c index bde98b065e..9af8ee2f31 100644 --- a/legacy/evas/src/modules/savers/tiff/evas_image_save_tiff.c +++ b/legacy/evas/src/modules/savers/tiff/evas_image_save_tiff.c @@ -115,19 +115,21 @@ int evas_image_save_file_tiff(RGBA_Image *im, const char *file, const char *key, return save_image_tiff(im, file, compress, 0); } -int module_open(Evas_Module *em) +EAPI int +module_open(Evas_Module *em) { if (!em) return 0; em->functions = (void *)(&evas_image_save_tiff_func); return 1; } -void module_close(void) +EAPI void +module_close(void) { } -Evas_Module_Api evas_modapi = +EAPI Evas_Module_Api evas_modapi = { EVAS_MODULE_API_VERSION, EVAS_MODULE_TYPE_IMAGE_SAVER,