hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix stride - again. but no one noticed this one ... yet :) 

SVN revision: 53388
This commit is contained in:
Carsten Haitzler 2010-10-14 03:21:20 +00:00
parent 0fccfcb4cf
commit 6debefec1c
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
legacy/evas/src/lib/canvas/evas_object_image.c
View File

@ -3122,18 +3122,18 @@ evas_object_image_is_inside(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
switch (o->cur.cspace) switch (o->cur.cspace)
{ {
case EVAS_COLORSPACE_ARGB8888: case EVAS_COLORSPACE_ARGB8888:
data = ((DATA32*)(data) + ((y * (stride >> 2)) + x)); data = ((DATA32*)(data) + ((y * (stride >> 2)) + x));
a = (*((DATA32*)(data)) >> 24) & 0xff; a = (*((DATA32*)(data)) >> 24) & 0xff;
break; break;
case EVAS_COLORSPACE_RGB565_A5P: case EVAS_COLORSPACE_RGB565_A5P:
data = (void*) ((DATA16*)(data) + (h * (stride >> 2))); data = (void*) ((DATA16*)(data) + (h * (stride >> 1)));
data = (void*) ((DATA8*)(data) + ((y * (stride >> 2)) + x)); data = (void*) ((DATA8*)(data) + ((y * (stride >> 1)) + x));
a = (*((DATA8*)(data))) & 0x1f; a = (*((DATA8*)(data))) & 0x1f;
break; break;
default: default:
return 1; return 1;
break; break;
} }
return (a != 0); return (a != 0);
@ -3205,7 +3205,7 @@ evas_object_image_data_convert_internal(Evas_Object_Image *o, void *data, Evas_C
out = evas_common_convert_argb8888_to(data, out = evas_common_convert_argb8888_to(data,
o->cur.image.w, o->cur.image.w,
o->cur.image.h, o->cur.image.h,
o->cur.image.stride >> 4, o->cur.image.stride >> 2,
o->cur.has_alpha, o->cur.has_alpha,
to_cspace); to_cspace);
break; break;
@ -3213,7 +3213,7 @@ evas_object_image_data_convert_internal(Evas_Object_Image *o, void *data, Evas_C
out = evas_common_convert_rgb565_a5p_to(data, out = evas_common_convert_rgb565_a5p_to(data,
o->cur.image.w, o->cur.image.w,
o->cur.image.h, o->cur.image.h,
o->cur.image.stride >> 4, o->cur.image.stride >> 1,
o->cur.has_alpha, o->cur.has_alpha,
to_cspace); to_cspace);
break; break;