hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5ade5ca4332aa51fdc1e179d3a5c24fe2574f76e
commit 5ade5ca4332aa51fdc1e179d3a5c24fe2574f76e
Author: ChunEon Park <her...@hermet.pe.kr>
Date: Thu Jun 26 17:00:37 2014 +0900
evas/png - better way to support png grayscale with transparency format.
suggested by cedric.
---
src/modules/evas/engines/gl_common/evas_gl_image.c | 6 ------
src/modules/evas/loaders/png/evas_image_load_png.c | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
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 7de5815..13b7598 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_image.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_image.c
@@ -222,12 +222,6 @@ _evas_gl_common_image(Evas_Engine_GL_Context *gc,
RGBA_Image *im_im, Evas_Image_
if (cspace == EVAS_COLORSPACE_ETC1 && gc->shared->info.etc2)
cspace = EVAS_COLORSPACE_RGB8_ETC2;
- /* Current GL doesn't support grayscale with transparency
- let it convert to argb8888 in loader */
- if ((cspace == EVAS_COLORSPACE_GRY8) &&
- im_im->cache_entry.flags.alpha)
- cspace = EVAS_COLORSPACE_ARGB8888;
-
im_im->cache_entry.space = cspace;
}
diff --git a/src/modules/evas/loaders/png/evas_image_load_png.c
b/src/modules/evas/loaders/png/evas_image_load_png.c
index f155d8b..a8e9aa3 100644
--- a/src/modules/evas/loaders/png/evas_image_load_png.c
+++ b/src/modules/evas/loaders/png/evas_image_load_png.c
@@ -182,7 +182,7 @@ evas_image_load_file_head_png(void *loader_data,
prop->cspaces = cspace_grey_alpha;
break;
case PNG_COLOR_TYPE_GRAY:
- prop->cspaces = cspace_grey;
+ if (!hasa) prop->cspaces = cspace_grey;
break;
}
if (hasa) prop->alpha = 1;
--
