kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

colorspace stuff in cvs. 

SVN revision: 34604
This commit is contained in:
Carsten Haitzler 2008-05-19 03:13:16 +00:00
parent e92406d330
commit 5887bde860
4 changed files with 93 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/evas/src/lib/Evas.h
View File

@ -532,6 +532,7 @@ extern "C" {
EAPI int evas_object_image_stride_get (const Evas_Object *obj);
EAPI int evas_object_image_load_error_get (const Evas_Object *obj);
EAPI void evas_object_image_data_set (Evas_Object *obj, void *data);
EAPI void *evas_object_image_data_convert (Evas_Object *obj, Evas_Colorspace to_cspace);
EAPI void *evas_object_image_data_get (const Evas_Object *obj, Evas_Bool for_writing);
EAPI void evas_object_image_data_copy_set (Evas_Object *obj, void *data);
EAPI void evas_object_image_data_update_add (Evas_Object *obj, int x, int y, int w, int h);

89
legacy/evas/src/lib/canvas/evas_object_image.c
View File

@ -67,6 +67,8 @@ static int evas_object_image_is_opaque(Evas_Object *obj);
static int evas_object_image_was_opaque(Evas_Object *obj);
static int evas_object_image_is_inside(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
static void *evas_object_image_data_convert_internal(Evas_Object_Image *o, void *data, Evas_Colorspace to_cspace);
static const Evas_Object_Func object_func =
{
/* methods (compulsory) */
@ -705,6 +707,46 @@ evas_object_image_load_error_get(const Evas_Object *obj)
* image object.
*/
/**
* Converts the raw image data of the given image object to the
* specified colorspace.
*
* Note that this function does not modify the raw image data.
* If the requested colorspace is the same as the image colorspace
* nothing is done and NULL is returned. You should use
* evas_object_image_colorspace_get() to check the current image
* colorspace.
*
* See @ref evas_object_image_colorspace_get.
*
* @param obj The given image object.
* @param to_cspace The colorspace to which the image raw data will be converted.
* @return data A newly allocated data in the format specified by to_cspace.
* @ingroup Evas_Object_Image_Data
*/
EAPI void *
evas_object_image_data_convert(Evas_Object *obj, Evas_Colorspace to_cspace)
{
Evas_Object_Image *o;
DATA32 *data;
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
return NULL;
MAGIC_CHECK_END();
o = (Evas_Object_Image *)(obj->object_data);
MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
return NULL;
MAGIC_CHECK_END();
if (!o->engine_data) return NULL;
if (!o->cur.cspace == to_cspace) return NULL;
data = NULL;
o->engine_data = obj->layer->evas->engine.func->image_data_get(obj->layer->evas->engine.data.output,
o->engine_data,
0,
&data);
return evas_object_image_data_convert_internal(o, data, to_cspace);
}
/**
* Sets the raw image data of the given image object.
*
@ -1127,7 +1169,19 @@ evas_object_image_save(const Evas_Object *obj, const char *file, const char *key
EVAS_COLORSPACE_ARGB8888);
if (im)
{
ok = evas_common_save_image_to_file(im, file, key, quality, compress);
if (o->cur.cspace == EVAS_COLORSPACE_ARGB8888)
im->image.data = data;
else
im->image.data = evas_object_image_data_convert_internal(o,
data,
EVAS_COLORSPACE_ARGB8888);
if (im->image.data)
{
ok = evas_common_save_image_to_file(im, file, key, quality, compress);
if (o->cur.cspace != EVAS_COLORSPACE_ARGB8888)
free(im->image.data);
}
evas_cache_image_drop(&im->cache_entry);
}
@ -2373,3 +2427,36 @@ evas_object_image_is_inside(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
return (a != 0);
}
static void *
evas_object_image_data_convert_internal(Evas_Object_Image *o, void *data, Evas_Colorspace to_cspace)
{
void *out = NULL;
if (!data)
return NULL;
switch (o->cur.cspace)
{
case EVAS_COLORSPACE_ARGB8888:
out = evas_common_convert_argb8888_to(data,
o->cur.image.w,
o->cur.image.h,
o->cur.image.stride,
o->cur.has_alpha,
to_cspace);
break;
case EVAS_COLORSPACE_RGB565_A5P:
out = evas_common_convert_rgb565_a5p_to(data,
o->cur.image.w,
o->cur.image.h,
o->cur.image.stride,
o->cur.has_alpha,
to_cspace);
break;
default:
break;
}
return out;
}

1
legacy/evas/src/lib/engines/common/Makefile.am
View File

@ -24,6 +24,7 @@ evas_op_mul_main_.c \
evas_blend_main.c \
evas_blit_main.c \
evas_convert_color.c \
evas_convert_colorspace.c \
evas_convert_gry_1.c \
evas_convert_gry_4.c \
evas_convert_gry_8.c \

3
legacy/evas/src/lib/include/evas_common.h
View File

@ -1039,6 +1039,9 @@ EAPI void evas_common_convert_color_rgb_to_hsv (int r, int g
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);
EAPI void *evas_common_convert_argb8888_to (void *data, int w, int h, int stride, Evas_Bool has_alpha, Evas_Colorspace cspace);
EAPI void *evas_common_convert_rgb565_a5p_to (void *data, int w, int h, int stride, Evas_Bool has_alpha, Evas_Colorspace cspace);
/****/
EAPI void evas_common_scale_init (void);