[EvasEngine] Fix build warning

Fix build warning for eng_image_native_set()

Change-Id: Ic5f730361d6a7c9456624e275f64b1dd31dd06e2

diff --git a/src/modules/evas/engines/drm/evas_engine.c b/src/modules/evas/engines/drm/evas_engine.c
index 9837548..a30a698 100644 (file)
--- a/src/modules/evas/engines/drm/evas_engine.c
+++ b/src/modules/evas/engines/drm/evas_engine.c
@@ -270,12 +270,12 @@ 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(),
+     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(),
+     im2 = (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(),
                                  ie->w, ie->h,
                                  NULL, 1,
                                  EVAS_COLORSPACE_ARGB8888);

diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c
index d1f442f..79f3f9b 100644 (file)
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -1861,18 +1861,6 @@ eng_image_native_set(void *data, void *image, void *native)
    return img;
 }
 
-static void *
-eng_image_native_get(void *data EINA_UNUSED, void *image)
-{
-   Evas_GL_Image *im = image;
-   Evas_Native_Surface *n;
-
-   if (!im) return NULL;
-   n = im->native.data;
-   if (!n) return NULL;
-   return n;
-}
-
 Eina_Bool
 eng_preload_make_current(void *data, void *doit)
 {

diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.c b/src/modules/evas/engines/wayland_shm/evas_engine.c
index 2f293bc..da4eb24 100644 (file)
--- a/src/modules/evas/engines/wayland_shm/evas_engine.c
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.c
@@ -295,7 +295,8 @@ eng_image_native_set(void *data EINA_UNUSED, void *image, void *native)
 {
    Evas_Native_Surface *ns = native;
    Image_Entry *ie = image;
-   RGBA_Image *im = image, *im2;
+   RGBA_Image *im = image;
+   RGBA_Image *im2 = NULL;
    void *wl_buf = NULL;
 
    if (!im) return im;
@@ -329,12 +330,12 @@ 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(),
+          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(),
+          im2 = (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(),
                                       ie->w, ie->h,
                                       NULL, 1,
                                       EVAS_COLORSPACE_ARGB8888);