devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=fecdb54674601c18885fa9b07a6fd8774b134897

commit fecdb54674601c18885fa9b07a6fd8774b134897
Author: Chris Michael <cpmich...@osg.samsung.com>
Date:   Fri Feb 5 08:41:35 2016 -0500

    evas-wayland-shm: Fix compiler warning about incompatible pointer type
    
    This patch fixes some compiler warnings about assignment from
    incompatible pointer type when getting image data from evas_cache. The
    simple fix is to cast the return value to RGBA_Image.
    
    Signed-off-by: Chris Michael <cpmich...@osg.samsung.com>
---
 src/modules/evas/engines/wayland_shm/evas_engine.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.c 
b/src/modules/evas/engines/wayland_shm/evas_engine.c
index e6a810c..5f1f78a 100644
--- a/src/modules/evas/engines/wayland_shm/evas_engine.c
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.c
@@ -289,15 +289,15 @@ eng_image_native_set(void *data EINA_UNUSED, void *image, 
void *native)
 
    if ((ns->type == EVAS_NATIVE_SURFACE_OPENGL) &&
        (ns->version == EVAS_NATIVE_SURFACE_VERSION))
-     im2 = evas_cache_image_data(evas_common_image_cache_get(),
-                                 ie->w, ie->h,
-                                 ns->data.x11.visual, 1,
-                                 EVAS_COLORSPACE_ARGB8888);
+     im2 = (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(),
+                                               ie->w, ie->h,
+                                               ns->data.x11.visual, 1,
+                                               EVAS_COLORSPACE_ARGB8888);
    else
-     im2 = evas_cache_image_data(evas_common_image_cache_get(),
-                                 ie->w, ie->h,
-                                 NULL, 1,
-                                 EVAS_COLORSPACE_ARGB8888);
+     im2 = (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(),
+                                               ie->w, ie->h,
+                                               NULL, 1,
+                                               EVAS_COLORSPACE_ARGB8888);
 
    if (im->native.data)
       {

-- 


Reply via email to