Yay. :) On 15/04/14 10:50, Jean-Philippe ANDRÉ wrote: > jpeg pushed a commit to branch master. > > http://git.enlightenment.org/core/efl.git/commit/?id=54fb9b23467211574848e84d5a3771bd61a3789e > > commit 54fb9b23467211574848e84d5a3771bd61a3789e > Author: Jean-Philippe Andre <jp.an...@samsung.com> > Date: Tue Apr 8 17:19:38 2014 +0900 > > Evas: Use Evas_Colorspace to declare cspace > > Why use int when we have a proper type? > All these APIs are internal. > --- > src/lib/evas/cache/evas_cache.h | 16 > ++++++++-------- > src/lib/evas/cache/evas_cache_engine_image.c | 6 +++--- > src/lib/evas/cache/evas_cache_image.c | 6 ++++-- > src/lib/evas/cache2/evas_cache2.c | 4 ++-- > src/lib/evas/cache2/evas_cache2.h | 10 +++++----- > src/lib/evas/common/evas_image_data.c | 6 +++--- > src/lib/evas/common/evas_image_private.h | 6 +++--- > src/lib/evas/include/evas_private.h | 8 ++++---- > src/modules/evas/engines/gl_cocoa/evas_engine.c | 8 ++++---- > src/modules/evas/engines/gl_common/evas_gl_common.h | 8 ++++---- > src/modules/evas/engines/gl_common/evas_gl_image.c | 8 ++++---- > src/modules/evas/engines/gl_sdl/evas_engine.c | 8 ++++---- > src/modules/evas/engines/gl_x11/evas_engine.c | 9 +++++---- > src/modules/evas/engines/software_generic/evas_engine.c | 8 ++++---- > src/modules/evas/engines/wayland_egl/evas_engine.c | 10 +++++----- > 15 files changed, 62 insertions(+), 59 deletions(-) > > diff --git a/src/lib/evas/cache/evas_cache.h b/src/lib/evas/cache/evas_cache.h > index da6ac2c..0731449 100644 > --- a/src/lib/evas/cache/evas_cache.h > +++ b/src/lib/evas/cache/evas_cache.h > @@ -29,10 +29,10 @@ struct _Evas_Cache_Image_Func > int (*size_set)(Image_Entry *dst, const Image_Entry *src, > unsigned int w, unsigned int h); > > /* The destination surface does not have any surface. */ > - int (*copied_data)(Image_Entry *dst, unsigned int w, unsigned > int h, DATA32 *image_data, int alpha, int cspace); > + int (*copied_data)(Image_Entry *dst, unsigned int w, unsigned > int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace); > /* The destination surface does not have any surface. */ > - int (*data)(Image_Entry *dst, unsigned int w, unsigned int h, > DATA32 *image_data, int alpha, int cspace); > - int (*color_space)(Image_Entry *dst, int cspace); > + int (*data)(Image_Entry *dst, unsigned int w, unsigned int h, > DATA32 *image_data, int alpha, Evas_Colorspace cspace); > + int (*color_space)(Image_Entry *dst, Evas_Colorspace cspace); > > /* This function need to update im->w and im->h. */ > int (*load)(Image_Entry *im); /**< return is EVAS_LOAD_ERROR_* > or EVAS_LOAD_ERROR_NONE! */ > @@ -137,8 +137,8 @@ EAPI Eina_Bool > evas_cache_image_is_loaded(Image_Entry *im); > EAPI void evas_cache_image_unload_all(Evas_Cache_Image > *cache); > EAPI void evas_cache_image_surface_alloc(Image_Entry > *im, unsigned int w, unsigned int h); > EAPI DATA32* evas_cache_image_pixels(Image_Entry *im); > -EAPI Image_Entry* evas_cache_image_copied_data(Evas_Cache_Image > *cache, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, int > cspace); > -EAPI Image_Entry* evas_cache_image_data(Evas_Cache_Image *cache, > unsigned int w, unsigned int h, DATA32 *image_data, int alpha, int cspace); > +EAPI Image_Entry* evas_cache_image_copied_data(Evas_Cache_Image > *cache, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, > Evas_Colorspace cspace); > +EAPI Image_Entry* evas_cache_image_data(Evas_Cache_Image *cache, > unsigned int w, unsigned int h, DATA32 *image_data, int alpha, > Evas_Colorspace cspace); > EAPI void evas_cache_image_colorspace(Image_Entry *im, > Evas_Colorspace cspace); > EAPI Image_Entry* evas_cache_image_empty(Evas_Cache_Image > *cache); > EAPI Image_Entry* evas_cache_image_size_set(Image_Entry *im, > unsigned int w, unsigned int h); > @@ -156,9 +156,9 @@ EAPI Engine_Image_Entry* > evas_cache_engine_image_engine(Evas_Cache_Engine_I > EAPI void > evas_cache_engine_image_drop(Engine_Image_Entry *eim); > EAPI Engine_Image_Entry* > evas_cache_engine_image_alone(Engine_Image_Entry *eim, void *data); > EAPI Engine_Image_Entry* > evas_cache_engine_image_dirty(Engine_Image_Entry *eim, unsigned int x, > unsigned int y, unsigned int w, unsigned int h); > -EAPI Engine_Image_Entry* > evas_cache_engine_image_copied_data(Evas_Cache_Engine_Image *cache, unsigned > int w, unsigned int h, DATA32 *image_data, int alpha, int cspace, void > *engine_data); > -EAPI Engine_Image_Entry* > evas_cache_engine_image_data(Evas_Cache_Engine_Image *cache, unsigned int w, > unsigned int h, DATA32 *image_data, int alpha, int cspace, void *engine_data); > -EAPI void > evas_cache_engine_image_colorspace(Engine_Image_Entry *eim, int cspace, void > *engine_data); > +EAPI Engine_Image_Entry* > evas_cache_engine_image_copied_data(Evas_Cache_Engine_Image *cache, unsigned > int w, unsigned int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace, > void *engine_data); > +EAPI Engine_Image_Entry* > evas_cache_engine_image_data(Evas_Cache_Engine_Image *cache, unsigned int w, > unsigned int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace, void > *engine_data); > +EAPI void > evas_cache_engine_image_colorspace(Engine_Image_Entry *eim, Evas_Colorspace > cspace, void *engine_data); > EAPI Engine_Image_Entry* > evas_cache_engine_image_size_set(Engine_Image_Entry *eim, unsigned int w, > unsigned int h); > > EAPI void > evas_cache_engine_image_load_data(Engine_Image_Entry *eim); > diff --git a/src/lib/evas/cache/evas_cache_engine_image.c > b/src/lib/evas/cache/evas_cache_engine_image.c > index 5c6ae42..149c4bb 100644 > --- a/src/lib/evas/cache/evas_cache_engine_image.c > +++ b/src/lib/evas/cache/evas_cache_engine_image.c > @@ -539,7 +539,7 @@ > _evas_cache_engine_image_push_dirty(Evas_Cache_Engine_Image *cache, > Image_Entry > } > > EAPI Engine_Image_Entry * > -evas_cache_engine_image_copied_data(Evas_Cache_Engine_Image *cache, unsigned > int w, unsigned int h, DATA32 *image_data, int alpha, int cspace, void > *engine_data) > +evas_cache_engine_image_copied_data(Evas_Cache_Engine_Image *cache, unsigned > int w, unsigned int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace, > void *engine_data) > { > Image_Entry *im; > > @@ -551,7 +551,7 @@ > evas_cache_engine_image_copied_data(Evas_Cache_Engine_Image *cache, unsigned > int > } > > EAPI Engine_Image_Entry * > -evas_cache_engine_image_data(Evas_Cache_Engine_Image *cache, unsigned int w, > unsigned int h, DATA32 *image_data, int alpha, int cspace, void *engine_data) > +evas_cache_engine_image_data(Evas_Cache_Engine_Image *cache, unsigned int w, > unsigned int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace, void > *engine_data) > { > Image_Entry *im; > > @@ -679,7 +679,7 @@ evas_cache_engine_image_engine(Evas_Cache_Engine_Image > *cache, void *engine_data > } > > EAPI void > -evas_cache_engine_image_colorspace(Engine_Image_Entry *eim, int cspace, void > *engine_data) > +evas_cache_engine_image_colorspace(Engine_Image_Entry *eim, Evas_Colorspace > cspace, void *engine_data) > { > Evas_Cache_Engine_Image *cache = eim->cache; > > diff --git a/src/lib/evas/cache/evas_cache_image.c > b/src/lib/evas/cache/evas_cache_image.c > index 65fc6d2..70d0547 100644 > --- a/src/lib/evas/cache/evas_cache_image.c > +++ b/src/lib/evas/cache/evas_cache_image.c > @@ -1038,7 +1038,8 @@ on_error: > EAPI Image_Entry * > evas_cache_image_copied_data(Evas_Cache_Image *cache, > unsigned int w, unsigned int h, > - DATA32 *image_data, int alpha, int cspace) > + DATA32 *image_data, int alpha, > + Evas_Colorspace cspace) > { > Image_Entry *im; > > @@ -1064,7 +1065,8 @@ evas_cache_image_copied_data(Evas_Cache_Image *cache, > } > > EAPI Image_Entry * > -evas_cache_image_data(Evas_Cache_Image *cache, unsigned int w, unsigned int > h, DATA32 *image_data, int alpha, int cspace) > +evas_cache_image_data(Evas_Cache_Image *cache, unsigned int w, unsigned int > h, > + DATA32 *image_data, int alpha, Evas_Colorspace cspace) > { > Image_Entry *im; > > diff --git a/src/lib/evas/cache2/evas_cache2.c > b/src/lib/evas/cache2/evas_cache2.c > index 5690a91..353ab0d 100644 > --- a/src/lib/evas/cache2/evas_cache2.c > +++ b/src/lib/evas/cache2/evas_cache2.c > @@ -385,7 +385,7 @@ _evas_cache2_image_entry_preload_remove(Image_Entry *ie, > const void *target) > } > > EAPI Image_Entry * > -evas_cache2_image_copied_data(Evas_Cache2 *cache, unsigned int w, unsigned > int h, DATA32 *image_data, int alpha, int cspace) > +evas_cache2_image_copied_data(Evas_Cache2 *cache, unsigned int w, unsigned > int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace) > { > Image_Entry *im; > > @@ -415,7 +415,7 @@ evas_cache2_image_copied_data(Evas_Cache2 *cache, > unsigned int w, unsigned int h > } > > EAPI Image_Entry * > -evas_cache2_image_data(Evas_Cache2 *cache, unsigned int w, unsigned int h, > DATA32 *image_data, int alpha, int cspace) > +evas_cache2_image_data(Evas_Cache2 *cache, unsigned int w, unsigned int h, > DATA32 *image_data, int alpha, Evas_Colorspace cspace) > { > Image_Entry *im; > > diff --git a/src/lib/evas/cache2/evas_cache2.h > b/src/lib/evas/cache2/evas_cache2.h > index 6c7f5f8..efa76fc 100644 > --- a/src/lib/evas/cache2/evas_cache2.h > +++ b/src/lib/evas/cache2/evas_cache2.h > @@ -27,10 +27,10 @@ struct _Evas_Cache2_Image_Func > int (*size_set)(Image_Entry *dst, const Image_Entry *src, > unsigned int w, unsigned int h); > > /* The destination surface does not have any surface. */ > - int (*copied_data)(Image_Entry *dst, unsigned int w, unsigned > int h, DATA32 *image_data, int alpha, int cspace); > + int (*copied_data)(Image_Entry *dst, unsigned int w, unsigned > int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace); > /* The destination surface does not have any surface. */ > - int (*data)(Image_Entry *dst, unsigned int w, unsigned int h, > DATA32 *image_data, int alpha, int cspace); > - int (*color_space)(Image_Entry *dst, int cspace); > + int (*data)(Image_Entry *dst, unsigned int w, unsigned int h, > DATA32 *image_data, int alpha, Evas_Colorspace cspace); > + int (*color_space)(Image_Entry *dst, Evas_Colorspace cspace); > > /* This function need to update im->w and im->h. */ > // int (*load)(Image_Entry *im); /**< return is > EVAS_LOAD_ERROR_* or EVAS_LOAD_ERROR_NONE! */ > @@ -71,8 +71,8 @@ EAPI void evas_cache2_image_cache_key_create(char *hkey, > const char *path, size_ > > EAPI DATA32 * evas_cache2_image_pixels(Image_Entry *im); > EAPI Image_Entry * evas_cache2_image_writable(Image_Entry *im); > -EAPI Image_Entry * evas_cache2_image_data(Evas_Cache2 *cache, unsigned int > w, unsigned int h, DATA32 *image_data, int alpha, int cspace); > -EAPI Image_Entry * evas_cache2_image_copied_data(Evas_Cache2 *cache, > unsigned int w, unsigned int h, DATA32 *image_data, int alpha, int cspace); > +EAPI Image_Entry * evas_cache2_image_data(Evas_Cache2 *cache, unsigned int > w, unsigned int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace); > +EAPI Image_Entry * evas_cache2_image_copied_data(Evas_Cache2 *cache, > unsigned int w, unsigned int h, DATA32 *image_data, int alpha, > Evas_Colorspace cspace); > EAPI Image_Entry * evas_cache2_image_size_set(Image_Entry *im, unsigned int > w, unsigned h); > EAPI Image_Entry * evas_cache2_image_dirty(Image_Entry *im, unsigned int x, > unsigned int y, unsigned int w, unsigned int h); > EAPI Image_Entry * evas_cache2_image_empty(Evas_Cache2 *cache); > diff --git a/src/lib/evas/common/evas_image_data.c > b/src/lib/evas/common/evas_image_data.c > index 138186c..b6e2bdc 100644 > --- a/src/lib/evas/common/evas_image_data.c > +++ b/src/lib/evas/common/evas_image_data.c > @@ -9,7 +9,7 @@ > #include "evas_image.h" > > int > -evas_common_rgba_image_from_data(Image_Entry* ie_dst, int w, int h, DATA32 > *image_data, int alpha, int cspace) > +evas_common_rgba_image_from_data(Image_Entry* ie_dst, int w, int h, DATA32 > *image_data, int alpha, Evas_Colorspace cspace) > { > RGBA_Image *dst = (RGBA_Image *) ie_dst; > > @@ -40,7 +40,7 @@ evas_common_rgba_image_from_data(Image_Entry* ie_dst, int > w, int h, DATA32 *imag > dst->cache_entry.h = h; > dst->cs.data = image_data; > dst->cs.no_free = 1; > - break; > + break; > default: > abort(); > break; > @@ -52,7 +52,7 @@ evas_common_rgba_image_from_data(Image_Entry* ie_dst, int > w, int h, DATA32 *imag > } > > int > -evas_common_rgba_image_from_copied_data(Image_Entry* ie_dst, int w, int h, > DATA32 *image_data, int alpha, int cspace) > +evas_common_rgba_image_from_copied_data(Image_Entry* ie_dst, int w, int h, > DATA32 *image_data, int alpha, Evas_Colorspace cspace) > { > RGBA_Image *dst = (RGBA_Image *) ie_dst; > > diff --git a/src/lib/evas/common/evas_image_private.h > b/src/lib/evas/common/evas_image_private.h > index f40866c..c7f619c 100644 > --- a/src/lib/evas/common/evas_image_private.h > +++ b/src/lib/evas/common/evas_image_private.h > @@ -2,9 +2,9 @@ > #define _EVAS_IMAGE_PRIVATE_H > > int evas_common_rgba_image_size_set (Image_Entry* > dst, const Image_Entry* im, unsigned int w, unsigned int h); > -int evas_common_rgba_image_from_copied_data (Image_Entry* > dst, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, int > cspace); > -int evas_common_rgba_image_from_data (Image_Entry* > dst, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, int > cspace); > -int evas_common_rgba_image_colorspace_set (Image_Entry* > dst, int cspace); > +int evas_common_rgba_image_from_copied_data (Image_Entry* > dst, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, > Evas_Colorspace cspace); > +int evas_common_rgba_image_from_data (Image_Entry* > dst, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, > Evas_Colorspace cspace); > +int evas_common_rgba_image_colorspace_set (Image_Entry* > dst, Evas_Colorspace cspace); > > void evas_common_scalecache_init(void); > void evas_common_scalecache_shutdown(void); > diff --git a/src/lib/evas/include/evas_private.h > b/src/lib/evas/include/evas_private.h > index f67f731..8f77c56 100644 > --- a/src/lib/evas/include/evas_private.h > +++ b/src/lib/evas/include/evas_private.h > @@ -817,8 +817,8 @@ struct _Evas_Func > > void *(*image_load) (void *data, const char *file, > const char *key, int *error, Evas_Image_Load_Opts *lo); > void *(*image_mmap) (void *data, Eina_File *f, const > char *key, int *error, Evas_Image_Load_Opts *lo); > - void *(*image_new_from_data) (void *data, int w, int h, DATA32 > *image_data, int alpha, int cspace); > - void *(*image_new_from_copied_data) (void *data, int w, int h, DATA32 > *image_data, int alpha, int cspace); > + void *(*image_new_from_data) (void *data, int w, int h, DATA32 > *image_data, int alpha, Evas_Colorspace cspace); > + void *(*image_new_from_copied_data) (void *data, int w, int h, DATA32 > *image_data, int alpha, Evas_Colorspace cspace); > void (*image_free) (void *data, void *image); > void (*image_size_get) (void *data, void *image, int > *w, int *h); > void *(*image_size_set) (void *data, void *image, int w, > int h); > @@ -835,8 +835,8 @@ struct _Evas_Func > Eina_Bool (*image_draw) (void *data, void *context, void > *surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x, > int dst_y, int dst_w, int dst_h, int smooth, Eina_Bool do_async); > char *(*image_comment_get) (void *data, void *image, char > *key); > char *(*image_format_get) (void *data, void *image); > - void (*image_colorspace_set) (void *data, void *image, int > cspace); > - int (*image_colorspace_get) (void *data, void *image); > + void (*image_colorspace_set) (void *data, void *image, > Evas_Colorspace cspace); > + Evas_Colorspace (*image_colorspace_get) (void *data, void *image); > Eina_Bool (*image_can_region_get) (void *data, void *image); > void *(*image_native_set) (void *data, void *image, void > *native); > void *(*image_native_get) (void *data, void *image); > diff --git a/src/modules/evas/engines/gl_cocoa/evas_engine.c > b/src/modules/evas/engines/gl_cocoa/evas_engine.c > index d18df25..e7a0e76 100644 > --- a/src/modules/evas/engines/gl_cocoa/evas_engine.c > +++ b/src/modules/evas/engines/gl_cocoa/evas_engine.c > @@ -395,7 +395,7 @@ eng_image_alpha_get(void *data EINA_UNUSED, void *image) > return im->alpha; > } > > -static int > +static Evas_Colorspace > eng_image_colorspace_get(void *data EINA_UNUSED, void *image) > { > // Render_Engine *re; > @@ -512,7 +512,7 @@ eng_image_format_get(void *data EINA_UNUSED, void *image) > } > > static void > -eng_image_colorspace_set(void *data, void *image, int cspace) > +eng_image_colorspace_set(void *data, void *image, Evas_Colorspace cspace) > { > Render_Engine *re; > Evas_GL_Image *im; > @@ -598,7 +598,7 @@ eng_image_mmap(void *data, Eina_File *f, const char *key, > int *error, Evas_Image > } > > static void * > -eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int > alpha, int cspace) > +eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int > alpha, Evas_Colorspace cspace) > { > Render_Engine *re; > > @@ -608,7 +608,7 @@ eng_image_new_from_data(void *data, int w, int h, DATA32 > *image_data, int alpha, > } > > static void * > -eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data, > int alpha, int cspace) > +eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data, > int alpha, Evas_Colorspace cspace) > { > Render_Engine *re; > > diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h > b/src/modules/evas/engines/gl_common/evas_gl_common.h > index f35d9c9..a4de175 100644 > --- a/src/modules/evas/engines/gl_common/evas_gl_common.h > +++ b/src/modules/evas/engines/gl_common/evas_gl_common.h > @@ -604,7 +604,7 @@ struct _Evas_GL_Image > // if im->im == NULL, it's a render-surface so these here are used > int w, h; > struct { > - int space; > + Evas_Colorspace space; > void *data; > unsigned char no_free : 1; > } cs; > @@ -806,9 +806,9 @@ void evas_gl_common_image_ref(Evas_GL_Image > *im); > void evas_gl_common_image_unref(Evas_GL_Image *im); > Evas_GL_Image *evas_gl_common_image_load(Evas_Engine_GL_Context *gc, > const char *file, const char *key, Evas_Image_Load_Opts *lo, int *error); > Evas_GL_Image *evas_gl_common_image_mmap(Evas_Engine_GL_Context *gc, > Eina_File *f, const char *key, Evas_Image_Load_Opts *lo, int *error); > -Evas_GL_Image *evas_gl_common_image_new_from_data(Evas_Engine_GL_Context > *gc, unsigned int w, unsigned int h, DATA32 *data, int alpha, int cspace); > -Evas_GL_Image > *evas_gl_common_image_new_from_copied_data(Evas_Engine_GL_Context *gc, > unsigned int w, unsigned int h, DATA32 *data, int alpha, int cspace); > -Evas_GL_Image *evas_gl_common_image_new(Evas_Engine_GL_Context *gc, > unsigned int w, unsigned int h, int alpha, int cspace); > +Evas_GL_Image *evas_gl_common_image_new_from_data(Evas_Engine_GL_Context > *gc, unsigned int w, unsigned int h, DATA32 *data, int alpha, Evas_Colorspace > cspace); > +Evas_GL_Image > *evas_gl_common_image_new_from_copied_data(Evas_Engine_GL_Context *gc, > unsigned int w, unsigned int h, DATA32 *data, int alpha, Evas_Colorspace > cspace); > +Evas_GL_Image *evas_gl_common_image_new(Evas_Engine_GL_Context *gc, > unsigned int w, unsigned int h, int alpha, Evas_Colorspace cspace); > Evas_GL_Image *evas_gl_common_image_alpha_set(Evas_GL_Image *im, int > alpha); > void evas_gl_common_image_native_enable(Evas_GL_Image *im); > void evas_gl_common_image_native_disable(Evas_GL_Image *im); > diff --git a/src/modules/evas/engines/gl_common/evas_gl_image.c > b/src/modules/evas/engines/gl_common/evas_gl_image.c > index a74f45a..70ff5e0 100644 > --- a/src/modules/evas/engines/gl_common/evas_gl_image.c > +++ b/src/modules/evas/engines/gl_common/evas_gl_image.c > @@ -140,7 +140,7 @@ _evas_gl_common_image(Evas_Engine_GL_Context *gc, > RGBA_Image *im_im, Evas_Image_ > { > Evas_GL_Image *im; > Eina_List *l; > - int cspace = EVAS_COLORSPACE_ARGB8888; > + Evas_Colorspace cspace = EVAS_COLORSPACE_ARGB8888; > > /* i'd LOVe to do this, but we can't because we load to load header > * to get image size to know if its too big or not! so this disallows > @@ -286,7 +286,7 @@ evas_gl_common_image_mmap(Evas_Engine_GL_Context *gc, > Eina_File *f, const char * > } > > Evas_GL_Image * > -evas_gl_common_image_new_from_data(Evas_Engine_GL_Context *gc, unsigned int > w, unsigned int h, DATA32 *data, int alpha, int cspace) > +evas_gl_common_image_new_from_data(Evas_Engine_GL_Context *gc, unsigned int > w, unsigned int h, DATA32 *data, int alpha, Evas_Colorspace cspace) > { > Evas_GL_Image *im; > Eina_List *l; > @@ -350,7 +350,7 @@ evas_gl_common_image_new_from_data(Evas_Engine_GL_Context > *gc, unsigned int w, u > } > > Evas_GL_Image * > -evas_gl_common_image_new_from_copied_data(Evas_Engine_GL_Context *gc, > unsigned int w, unsigned int h, DATA32 *data, int alpha, int cspace) > +evas_gl_common_image_new_from_copied_data(Evas_Engine_GL_Context *gc, > unsigned int w, unsigned int h, DATA32 *data, int alpha, Evas_Colorspace > cspace) > { > Evas_GL_Image *im; > > @@ -401,7 +401,7 @@ > evas_gl_common_image_new_from_copied_data(Evas_Engine_GL_Context *gc, > unsigned i > } > > Evas_GL_Image * > -evas_gl_common_image_new(Evas_Engine_GL_Context *gc, unsigned int w, > unsigned int h, int alpha, int cspace) > +evas_gl_common_image_new(Evas_Engine_GL_Context *gc, unsigned int w, > unsigned int h, int alpha, Evas_Colorspace cspace) > { > Evas_GL_Image *im; > > diff --git a/src/modules/evas/engines/gl_sdl/evas_engine.c > b/src/modules/evas/engines/gl_sdl/evas_engine.c > index dcbfb79..c57d770 100644 > --- a/src/modules/evas/engines/gl_sdl/evas_engine.c > +++ b/src/modules/evas/engines/gl_sdl/evas_engine.c > @@ -335,7 +335,7 @@ eng_image_alpha_get(void *data EINA_UNUSED, void *image) > return im ? im->alpha : 1; > } > > -static int > +static Evas_Colorspace > eng_image_colorspace_get(void *data EINA_UNUSED, void *image) > { > Evas_GL_Image *im = image; > @@ -406,7 +406,7 @@ eng_image_format_get(void *data EINA_UNUSED, void *image > EINA_UNUSED) > } > > static void > -eng_image_colorspace_set(void *data EINA_UNUSED, void *image, int cspace) > +eng_image_colorspace_set(void *data EINA_UNUSED, void *image, > Evas_Colorspace cspace) > { > Evas_GL_Image *im; > > @@ -497,7 +497,7 @@ eng_image_mmap(void *data, Eina_File *f, const char *key, > int *error, Evas_Image > } > > static void * > -eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int > alpha, int cspace) > +eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int > alpha, Evas_Colorspace cspace) > { > Render_Engine *re = data; > > @@ -505,7 +505,7 @@ eng_image_new_from_data(void *data, int w, int h, DATA32 > *image_data, int alpha, > } > > static void * > -eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data, > int alpha, int cspace) > +eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data, > int alpha, Evas_Colorspace cspace) > { > Render_Engine *re = data; > > diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c > b/src/modules/evas/engines/gl_x11/evas_engine.c > index 0d9381a..490fad7 100644 > --- a/src/modules/evas/engines/gl_x11/evas_engine.c > +++ b/src/modules/evas/engines/gl_x11/evas_engine.c > @@ -1840,7 +1840,7 @@ eng_image_alpha_get(void *data EINA_UNUSED, void *image) > return im->alpha; > } > > -static int > +static Evas_Colorspace > eng_image_colorspace_get(void *data EINA_UNUSED, void *image) > { > // Render_Engine *re; > @@ -1951,7 +1951,7 @@ eng_image_format_get(void *data EINA_UNUSED, void > *image) > } > > static void > -eng_image_colorspace_set(void *data, void *image, int cspace) > +eng_image_colorspace_set(void *data, void *image, Evas_Colorspace cspace) > { > Render_Engine *re; > Evas_GL_Image *im; > @@ -2638,7 +2638,7 @@ eng_image_mmap(void *data, Eina_File *f, const char > *key, int *error, Evas_Image > } > > static void * > -eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int > alpha, int cspace) > +eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int > alpha, Evas_Colorspace cspace) > { > Render_Engine *re; > > @@ -2648,7 +2648,7 @@ eng_image_new_from_data(void *data, int w, int h, > DATA32 *image_data, int alpha, > } > > static void * > -eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data, > int alpha, int cspace) > +eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data, > int alpha, Evas_Colorspace cspace) > { > Render_Engine *re; > > @@ -2717,6 +2717,7 @@ eng_image_size_set(void *data, void *image, int w, int > h) > case EVAS_COLORSPACE_YCBCR420TM12601_PL: > w &= ~0x1; > break; > + default: break; > } > > evas_gl_common_image_alloc_ensure(im_old); > diff --git a/src/modules/evas/engines/software_generic/evas_engine.c > b/src/modules/evas/engines/software_generic/evas_engine.c > index f3abf88..1b8f76a 100644 > --- a/src/modules/evas/engines/software_generic/evas_engine.c > +++ b/src/modules/evas/engines/software_generic/evas_engine.c > @@ -829,7 +829,7 @@ eng_image_alpha_get(void *data EINA_UNUSED, void *image) > return 0; > } > > -static int > +static Evas_Colorspace > eng_image_colorspace_get(void *data EINA_UNUSED, void *image) > { > Image_Entry *im; > @@ -902,7 +902,7 @@ eng_image_format_get(void *data EINA_UNUSED, void *image > EINA_UNUSED) > } > > static void > -eng_image_colorspace_set(void *data EINA_UNUSED, void *image, int cspace) > +eng_image_colorspace_set(void *data EINA_UNUSED, void *image, > Evas_Colorspace cspace) > { > Image_Entry *im; > > @@ -1006,7 +1006,7 @@ use_local_cache: > } > > static void * > -eng_image_new_from_data(void *data EINA_UNUSED, int w, int h, DATA32 > *image_data, int alpha, int cspace) > +eng_image_new_from_data(void *data EINA_UNUSED, int w, int h, DATA32 > *image_data, int alpha, Evas_Colorspace cspace) > { > #ifdef EVAS_CSERVE2 > if (evas_cserve2_use_get()) > @@ -1019,7 +1019,7 @@ eng_image_new_from_data(void *data EINA_UNUSED, int w, > int h, DATA32 *image_data > } > > static void * > -eng_image_new_from_copied_data(void *data EINA_UNUSED, int w, int h, DATA32 > *image_data, int alpha, int cspace) > +eng_image_new_from_copied_data(void *data EINA_UNUSED, int w, int h, DATA32 > *image_data, int alpha, Evas_Colorspace cspace) > { > #ifdef EVAS_CSERVE2 > if (evas_cserve2_use_get()) > diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c > b/src/modules/evas/engines/wayland_egl/evas_engine.c > index d629d78..ffc43d2 100644 > --- a/src/modules/evas/engines/wayland_egl/evas_engine.c > +++ b/src/modules/evas/engines/wayland_egl/evas_engine.c > @@ -90,7 +90,7 @@ static void _native_bind_cb(void *data EINA_UNUSED, void > *image); > static void _native_unbind_cb(void *data EINA_UNUSED, void *image); > static void _native_free_cb(void *data, void *image); > > -static int eng_image_colorspace_get(void *data EINA_UNUSED, void *image); > +static Evas_Colorspace eng_image_colorspace_get(void *data EINA_UNUSED, void > *image); > static int eng_image_alpha_get(void *data EINA_UNUSED, void *image); > > static Eina_Bool eng_gl_preload_make_current(void *data, void *doit); > @@ -1600,7 +1600,7 @@ eng_image_mmap(void *data, Eina_File *f, const char > *key, int *error, Evas_Image > } > > static void * > -eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int > alpha, int cspace) > +eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int > alpha, Evas_Colorspace cspace) > { > Render_Engine *re; > > @@ -1610,7 +1610,7 @@ eng_image_new_from_data(void *data, int w, int h, > DATA32 *image_data, int alpha, > } > > static void * > -eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data, > int alpha, int cspace) > +eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data, > int alpha, Evas_Colorspace cspace) > { > Render_Engine *re; > > @@ -2065,7 +2065,7 @@ eng_image_format_get(void *data EINA_UNUSED, void > *image EINA_UNUSED) > } > > static void > -eng_image_colorspace_set(void *data, void *image, int cspace) > +eng_image_colorspace_set(void *data, void *image, Evas_Colorspace cspace) > { > Render_Engine *re; > Evas_GL_Image *im; > @@ -2113,7 +2113,7 @@ eng_image_colorspace_set(void *data, void *image, int > cspace) > im->cs.space = cspace; > } > > -static int > +static Evas_Colorspace > eng_image_colorspace_get(void *data EINA_UNUSED, void *image) > { > Evas_GL_Image *im; >
------------------------------------------------------------------------------ Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/NeoTech _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
