jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5a1ef2155def5649940fbfc4861291db0060e1e0
commit 5a1ef2155def5649940fbfc4861291db0060e1e0
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Wed Apr 2 19:01:05 2014 +0900
Evas: Add support for AGRY88 in evas_common_rgba_image_from_copied_data
This should fix a potential abort().
---
src/lib/evas/common/evas_image_data.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/lib/evas/common/evas_image_data.c
b/src/lib/evas/common/evas_image_data.c
index ccf7581..f38c429 100644
--- a/src/lib/evas/common/evas_image_data.c
+++ b/src/lib/evas/common/evas_image_data.c
@@ -63,6 +63,16 @@ evas_common_rgba_image_from_copied_data(Image_Entry* ie_dst,
int w, int h, DATA3
if (image_data)
memcpy(dst->image.data, image_data, w * h * sizeof(DATA32));
break;
+ case EVAS_COLORSPACE_AGRY88:
+ dst->cache_entry.flags.alpha = 1;
+ if (image_data)
+ memcpy(dst->image.data8, image_data, w * h * sizeof(DATA16));
+ break;
+ case EVAS_COLORSPACE_GRY8:
+ dst->cache_entry.flags.alpha = 1;
+ if (image_data)
+ memcpy(dst->image.data8, image_data, w * h * sizeof(DATA8));
+ break;
case EVAS_COLORSPACE_YCBCR422P601_PL:
case EVAS_COLORSPACE_YCBCR422P709_PL:
case EVAS_COLORSPACE_YCBCR422601_PL:
@@ -72,11 +82,6 @@ evas_common_rgba_image_from_copied_data(Image_Entry* ie_dst,
int w, int h, DATA3
if (image_data && (dst->cs.data))
memcpy(dst->cs.data, image_data, dst->cache_entry.h *
sizeof(unsigned char*) * 2);
break;
- case EVAS_COLORSPACE_GRY8:
- dst->cache_entry.flags.alpha = 1;
- if (image_data)
- memcpy(dst->image.data8, image_data, w * h * sizeof(DATA8));
- break;
default:
abort();
break;
--
