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

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@53388 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/canvas/evas_object_image.c b/src/lib/canvas/evas_object_image.c
index 4b47f16..dd8fb91 100644 (file)
--- a/src/lib/canvas/evas_object_image.c
+++ b/src/lib/canvas/evas_object_image.c
@@ -3122,18 +3122,18 @@ evas_object_image_is_inside(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
 
    switch (o->cur.cspace)
      {
-       case EVAS_COLORSPACE_ARGB8888:
-         data = ((DATA32*)(data) + ((y * (stride >> 2)) + x));
-         a = (*((DATA32*)(data)) >> 24) & 0xff;
-         break;
-       case EVAS_COLORSPACE_RGB565_A5P:
-           data = (void*) ((DATA16*)(data) + (h * (stride >> 2)));
-         data = (void*) ((DATA8*)(data) + ((y * (stride >> 2)) + x));
-         a = (*((DATA8*)(data))) & 0x1f;
-         break;
-       default:
-         return 1;
-         break;
+     case EVAS_COLORSPACE_ARGB8888:
+        data = ((DATA32*)(data) + ((y * (stride >> 2)) + x));
+        a = (*((DATA32*)(data)) >> 24) & 0xff;
+        break;
+     case EVAS_COLORSPACE_RGB565_A5P:
+        data = (void*) ((DATA16*)(data) + (h * (stride >> 1)));
+        data = (void*) ((DATA8*)(data) + ((y * (stride >> 1)) + x));
+        a = (*((DATA8*)(data))) & 0x1f;
+        break;
+     default:
+        return 1;
+        break;
      }
 
    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,
                                                o->cur.image.w,
                                                o->cur.image.h,
-                                               o->cur.image.stride >> 4,
+                                               o->cur.image.stride >> 2,
                                                o->cur.has_alpha,
                                                to_cspace);
          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,
                                                  o->cur.image.w,
                                                  o->cur.image.h,
-                                                 o->cur.image.stride >> 4,
+                                                 o->cur.image.stride >> 1,
                                                  o->cur.has_alpha,
                                                  to_cspace);
          break;