Enlightenment CVS committal
Author : cedric
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/loaders/pmaps
Modified Files:
evas_image_load_pmaps.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/loaders/pmaps/evas_image_load_pmaps.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_image_load_pmaps.c 12 Apr 2008 00:32:29 -0000 1.2
+++ evas_image_load_pmaps.c 3 Jun 2008 09:09:38 -0000 1.3
@@ -8,9 +8,9 @@
#define FILE_BUFFER_SIZE 1024
#define FILE_BUFFER_UNREAD_SIZE 16
-static int evas_image_load_file_head_pmaps(RGBA_Image *im,
+static int evas_image_load_file_head_pmaps(Image_Entry *ie,
const char *file, const char *key);
-static int evas_image_load_file_data_pmaps(RGBA_Image *im,
+static int evas_image_load_file_data_pmaps(Image_Entry *ie,
const char *file, const char *key);
Evas_Image_Load_Func evas_image_load_pmaps_func = {
@@ -60,7 +60,7 @@
static int pmaps_buffer_comment_skip(Pmaps_Buffer *b);
static int
-evas_image_load_file_head_pmaps(RGBA_Image *im, const char *file,
+evas_image_load_file_head_pmaps(Image_Entry *ie, const char *file,
const char *key)
{
Pmaps_Buffer b;
@@ -80,8 +80,8 @@
return 0;
}
- im->cache_entry.w = b.w;
- im->cache_entry.h = b.h;
+ ie->w = b.w;
+ ie->h = b.h;
pmaps_buffer_close(&b);
return 1;
@@ -90,7 +90,7 @@
}
static int
-evas_image_load_file_data_pmaps(RGBA_Image *im, const char *file,
+evas_image_load_file_data_pmaps(Image_Entry *ie, const char *file,
const char *key)
{
Pmaps_Buffer b;
@@ -114,14 +114,14 @@
pixels = b.w * b.h;
- evas_cache_image_surface_alloc(&im->cache_entry, b.w, b.h);
- if (!im->image.data)
+ evas_cache_image_surface_alloc(ie, b.w, b.h);
+ if (!evas_cache_image_pixels(ie))
{
pmaps_buffer_close(&b);
return 0;
}
- ptr = im->image.data;
+ ptr = evas_cache_image_pixels(ie);
if (b.type[1] != '4')
{
-------------------------------------------------------------------------
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
