jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=77d0d69c3ec24acee0e22d99bcbf8f816c2b0353
commit 77d0d69c3ec24acee0e22d99bcbf8f816c2b0353
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Wed Apr 2 19:03:03 2014 +0900
Evas: Add support for AGRY88 in image creation functions
- evas_common_rgba_image_from_data
- evas_common_rgba_image_colorspace_set
- evas_common_image_colorspace_normalize
---
src/lib/evas/common/evas_image_data.c | 32 +++++++++++++++++---------------
src/lib/evas/common/evas_image_main.c | 1 +
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/src/lib/evas/common/evas_image_data.c
b/src/lib/evas/common/evas_image_data.c
index f38c429..138186c 100644
--- a/src/lib/evas/common/evas_image_data.c
+++ b/src/lib/evas/common/evas_image_data.c
@@ -15,13 +15,21 @@ evas_common_rgba_image_from_data(Image_Entry* ie_dst, int
w, int h, DATA32 *imag
switch (cspace)
{
- case EVAS_COLORSPACE_ARGB8888:
- dst->cache_entry.w = w;
- dst->cache_entry.h = h;
- dst->image.data = image_data;
- dst->image.no_free = 1;
- dst->cache_entry.flags.alpha = alpha ? 1 : 0;
- break;
+ case EVAS_COLORSPACE_ARGB8888:
+ dst->cache_entry.w = w;
+ dst->cache_entry.h = h;
+ dst->image.data = image_data;
+ dst->image.no_free = 1;
+ dst->cache_entry.flags.alpha = alpha ? 1 : 0;
+ break;
+ case EVAS_COLORSPACE_AGRY88:
+ case EVAS_COLORSPACE_GRY8:
+ dst->cache_entry.w = w;
+ dst->cache_entry.h = h;
+ dst->image.data8 = (DATA8 *) image_data;
+ dst->image.no_free = 1;
+ dst->cache_entry.flags.alpha = 1;
+ break;
case EVAS_COLORSPACE_YCBCR422P601_PL:
case EVAS_COLORSPACE_YCBCR422P709_PL:
case EVAS_COLORSPACE_YCBCR422601_PL:
@@ -32,14 +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;
- case EVAS_COLORSPACE_GRY8:
- dst->cache_entry.w = w;
- dst->cache_entry.h = h;
- dst->image.data8 = (DATA8 *) image_data;
- dst->image.no_free = 1;
- dst->cache_entry.flags.alpha = 1;
- break;
+ break;
default:
abort();
break;
@@ -126,6 +127,7 @@ evas_common_rgba_image_colorspace_set(Image_Entry* ie_dst,
Evas_Colorspace cspac
switch (cspace)
{
case EVAS_COLORSPACE_ARGB8888:
+ case EVAS_COLORSPACE_AGRY88:
case EVAS_COLORSPACE_GRY8:
if (dst->cs.data)
{
diff --git a/src/lib/evas/common/evas_image_main.c
b/src/lib/evas/common/evas_image_main.c
index f5b87f3..46fdcb2 100644
--- a/src/lib/evas/common/evas_image_main.c
+++ b/src/lib/evas/common/evas_image_main.c
@@ -760,6 +760,7 @@ evas_common_image_colorspace_normalize(RGBA_Image *im)
{
case EVAS_COLORSPACE_ARGB8888:
case EVAS_COLORSPACE_GRY8:
+ case EVAS_COLORSPACE_AGRY88:
if (im->image.data != im->cs.data)
{
#ifdef EVAS_CSERVE2
--
