Enlightenment CVS committal
Author : cedric
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/software_sdl
Modified Files:
evas_engine.c
Log Message:
* Make RGBA_IMAGE_HAS_ALPHA and RGBA_IMAGE_ALPHA_SPARSE part of
Image_Entry flag structure. This fix a bug with 16 bpp software engine.
* Change image loader module API to take any Image_Entry. Same goes
for evas_common_image_premul and evas_common_image_set_alpha_sparse.
* Use new eet API: eet_data_image_read_to_surface.
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/software_sdl/evas_engine.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- evas_engine.c 28 May 2008 19:27:41 -0000 1.10
+++ evas_engine.c 3 Jun 2008 09:09:37 -0000 1.11
@@ -336,7 +336,7 @@
switch (eim->cache_entry.src->space)
{
case EVAS_COLORSPACE_ARGB8888:
- if (im->flags & RGBA_IMAGE_HAS_ALPHA) return 1;
+ if (im->cache_entry.flags.alpha) return 1;
default:
break;
}
@@ -516,17 +516,14 @@
if (eim->cache_entry.src->space != EVAS_COLORSPACE_ARGB8888)
{
- im->flags &= ~RGBA_IMAGE_HAS_ALPHA;
+ im->cache_entry.flags.alpha = 0;
return eim;
}
eim = (SDL_Engine_Image_Entry *)
evas_cache_engine_image_dirty(&eim->cache_entry, 0, 0, eim->cache_entry.w,
eim->cache_entry.h);
/* FIXME: update SDL_Surface flags */
- if (has_alpha)
- im->flags |= RGBA_IMAGE_HAS_ALPHA;
- else
- im->flags &= ~RGBA_IMAGE_HAS_ALPHA;
+ im->cache_entry.flags.alpha = has_alpha ? 1 : 0;
return eim;
}
@@ -1007,7 +1004,7 @@
{
im->image.data = sdl->pixels;
im->image.no_free = 1;
- im->flags |= RGBA_IMAGE_HAS_ALPHA;
+ im->cache_entry.flags.alpha = 0;
dst->src->w = sdl->w;
dst->src->h = sdl->h;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
