From 3f28e611862fc1dc9113413f7bd21b913fbe8029 Mon Sep 17 00:00:00 2001 From: doursse Date: Sat, 19 Jul 2008 18:32:32 +0000 Subject: [PATCH] * move image declaration funtions to their own header file * add vim header SVN revision: 35173 --- .../evas/src/lib/engines/common/Makefile.am | 2 + .../evas/src/lib/engines/common/evas_image.h | 32 ++++++++++++++++ .../src/lib/engines/common/evas_image_data.c | 8 +++- .../src/lib/engines/common/evas_image_load.c | 4 ++ .../src/lib/engines/common/evas_image_main.c | 5 +++ .../lib/engines/common/evas_image_private.h | 13 +++++++ .../src/lib/engines/common/evas_image_save.c | 9 ++++- legacy/evas/src/lib/include/evas_common.h | 38 +------------------ 8 files changed, 71 insertions(+), 40 deletions(-) create mode 100644 legacy/evas/src/lib/engines/common/evas_image.h create mode 100644 legacy/evas/src/lib/engines/common/evas_image_private.h diff --git a/legacy/evas/src/lib/engines/common/Makefile.am b/legacy/evas/src/lib/engines/common/Makefile.am index 18f29ad6cb..753d269436 100644 --- a/legacy/evas/src/lib/engines/common/Makefile.am +++ b/legacy/evas/src/lib/engines/common/Makefile.am @@ -76,6 +76,8 @@ evas_convert_yuv.h \ evas_font.h \ evas_gradient.h \ evas_gradient_private.h \ +evas_image.h \ +evas_image_private.h \ evas_line.h \ evas_polygon.h \ evas_rectangle.h \ diff --git a/legacy/evas/src/lib/engines/common/evas_image.h b/legacy/evas/src/lib/engines/common/evas_image.h new file mode 100644 index 0000000000..2dfde62ec1 --- /dev/null +++ b/legacy/evas/src/lib/engines/common/evas_image.h @@ -0,0 +1,32 @@ +#ifndef _EVAS_IMAGE_H +#define _EVAS_IMAGE_H + + +EAPI void evas_common_image_init (void); +EAPI void evas_common_image_shutdown (void); + +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 (void); +EAPI Evas_Cache_Image *evas_common_image_cache_get (void); + +EAPI void evas_common_image_set_cache (int size); +EAPI 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); + +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); + +EAPI RGBA_Image *evas_common_load_image_from_file (const char *file, const char *key, RGBA_Image_Loadopts *lo); +EAPI int evas_common_save_image_to_file (RGBA_Image *im, const char *file, const char *key, int quality, int compress); + + +#endif /* _EVAS_IMAGE_H */ diff --git a/legacy/evas/src/lib/engines/common/evas_image_data.c b/legacy/evas/src/lib/engines/common/evas_image_data.c index c76917ee17..1a7090f959 100644 --- a/legacy/evas/src/lib/engines/common/evas_image_data.c +++ b/legacy/evas/src/lib/engines/common/evas_image_data.c @@ -1,8 +1,12 @@ -#include "evas_common.h" -#include "evas_private.h" +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ #include +#include "evas_common.h" +#include "evas_private.h" + int evas_common_rgba_image_from_data(Image_Entry* ie_dst, int w, int h, DATA32 *image_data, int alpha, int cspace) { diff --git a/legacy/evas/src/lib/engines/common/evas_image_load.c b/legacy/evas/src/lib/engines/common/evas_image_load.c index 4e3c2b6cf9..71a8486330 100644 --- a/legacy/evas/src/lib/engines/common/evas_image_load.c +++ b/legacy/evas/src/lib/engines/common/evas_image_load.c @@ -1,3 +1,7 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + #include "evas_common.h" #include "evas_private.h" diff --git a/legacy/evas/src/lib/engines/common/evas_image_main.c b/legacy/evas/src/lib/engines/common/evas_image_main.c index fd2dee1e2d..6943120a84 100644 --- a/legacy/evas/src/lib/engines/common/evas_image_main.c +++ b/legacy/evas/src/lib/engines/common/evas_image_main.c @@ -1,3 +1,7 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + #ifdef HAVE_CONFIG_H # include "config.h" /* so that EAPI in Eet.h is correctly defined */ #endif @@ -8,6 +12,7 @@ #include "evas_common.h" #include "evas_private.h" +#include "evas_image_private.h" #include "evas_convert_yuv.h" #ifdef HAVE_VALGRIND diff --git a/legacy/evas/src/lib/engines/common/evas_image_private.h b/legacy/evas/src/lib/engines/common/evas_image_private.h new file mode 100644 index 0000000000..5f07e8cfde --- /dev/null +++ b/legacy/evas/src/lib/engines/common/evas_image_private.h @@ -0,0 +1,13 @@ +#ifndef _EVAS_IMAGE_PRIVATE_H +#define _EVAS_IMAGE_PRIVATE_H + +int evas_common_load_rgba_image_module_from_file (Image_Entry *im); +int evas_common_load_rgba_image_data_from_file (Image_Entry *im); + +int evas_common_rgba_image_size_set (Image_Entry* dst, const Image_Entry* im, int w, int h); +int evas_common_rgba_image_from_copied_data (Image_Entry* dst, int w, int h, DATA32 *image_data, int alpha, int cspace); +int evas_common_rgba_image_from_data (Image_Entry* dst, int w, int h, DATA32 *image_data, int alpha, int cspace); +int evas_common_rgba_image_colorspace_set (Image_Entry* dst, int cspace); + + +#endif /* _EVAS_IMAGE_PRIVATE_H */ diff --git a/legacy/evas/src/lib/engines/common/evas_image_save.c b/legacy/evas/src/lib/engines/common/evas_image_save.c index 1bd0938086..9d2a686fcc 100644 --- a/legacy/evas/src/lib/engines/common/evas_image_save.c +++ b/legacy/evas/src/lib/engines/common/evas_image_save.c @@ -1,4 +1,11 @@ -#include "config.h" +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include "evas_options.h" #include "evas_common.h" diff --git a/legacy/evas/src/lib/include/evas_common.h b/legacy/evas/src/lib/include/evas_common.h index 73b46f6cbd..3cd879b9f8 100644 --- a/legacy/evas/src/lib/include/evas_common.h +++ b/legacy/evas/src/lib/include/evas_common.h @@ -830,43 +830,7 @@ EAPI Gfx_Func_Copy evas_common_draw_func_copy_get (int pixels, int #include "../engines/common/evas_scale_main.h" /****/ -/*done*/ -EAPI void evas_common_image_init (void); -EAPI void evas_common_image_shutdown (void); - -/*done - internal - dont use */ -int evas_common_load_rgba_image_module_from_file (Image_Entry *im); -int evas_common_load_rgba_image_data_from_file (Image_Entry *im); - -int evas_common_rgba_image_size_set (Image_Entry* dst, const Image_Entry* im, int w, int h); -int evas_common_rgba_image_from_copied_data (Image_Entry* dst, int w, int h, DATA32 *image_data, int alpha, int cspace); -int evas_common_rgba_image_from_data (Image_Entry* dst, int w, int h, DATA32 *image_data, int alpha, int cspace); -int evas_common_rgba_image_colorspace_set (Image_Entry* dst, int cspace); - -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 (void); -EAPI Evas_Cache_Image* evas_common_image_cache_get (void); - -/*done*/ -EAPI void evas_common_image_set_cache (int size); -EAPI 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); - -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); - -/*done*/ -EAPI RGBA_Image *evas_common_load_image_from_file (const char *file, const char *key, RGBA_Image_Loadopts *lo); -EAPI int evas_common_save_image_to_file (RGBA_Image *im, const char *file, const char *key, int quality, int compress); +#include "../engines/common/evas_image.h" /****/ #include "../engines/common/evas_line.h"