Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_object_image.c
Log Message:
cedric's cache changes patch
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_object_image.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- evas_object_image.c 8 Feb 2008 22:35:19 -0000 1.61
+++ evas_object_image.c 12 Apr 2008 00:32:25 -0000 1.62
@@ -1121,18 +1121,17 @@
else break;
}
}
- im = evas_cache_image_empty(evas_common_image_cache_get());
+ im = (RGBA_Image*) evas_cache_image_data(evas_common_image_cache_get(),
+ o->cur.image.w,
+ o->cur.image.h,
+ data,
+ o->cur.has_alpha,
+ EVAS_COLORSPACE_ARGB8888);
if (im)
{
- if (o->cur.has_alpha) im->flags |= RGBA_IMAGE_HAS_ALPHA;
-
- im->image->data = data;
- im->image->w = o->cur.image.w;
- im->image->h = o->cur.image.h;
- im->image->no_free = 1;
ok = evas_common_save_image_to_file(im, file, key, quality, compress);
- evas_cache_image_drop(im);
+ evas_cache_image_drop(&im->cache_entry);
}
return ok;
}
@@ -2332,7 +2331,7 @@
evas_object_image_is_inside(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{
Evas_Object_Image *o;
- void *data;
+ DATA32 *data;
int w, h, stride;
int a;
@@ -2354,7 +2353,7 @@
o->engine_data =
obj->layer->evas->engine.func->image_data_get(obj->layer->evas->engine.data.output,
o->engine_data,
0,
- (DATA32**)
&data);
+ &data);
if (!data)
return 0;
@@ -2365,8 +2364,8 @@
a = (*((DATA32*)(data)) >> 24) & 0xff;
break;
case EVAS_COLORSPACE_RGB565_A5P:
- data = ((DATA16*)(data) + (h * stride));
- data = ((DATA8*)(data) + ((y * stride) + x));
+ data = (void*) ((DATA16*)(data) + (h * stride));
+ data = (void*) ((DATA8*)(data) + ((y * stride) + x));
a = (*((DATA8*)(data))) & 0x1f;
break;
default:
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
