summaryrefslogtreecommitdiff
path: root/src/modules/evas
diff options
context:
space:
mode:
authorChris Michael <cpmichael@osg.samsung.com>2016-02-05 08:41:35 -0500
committerChris Michael <cpmichael@osg.samsung.com>2016-02-05 08:41:35 -0500
commitfecdb54674601c18885fa9b07a6fd8774b134897 (patch)
treec7fb4196307d94cc4e677dc31cd5545e6c378f4c /src/modules/evas
parent81d08c1db7bfbc576a1c2a5d6937482b34cdead2 (diff)
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 <cpmichael@osg.samsung.com>
Diffstat (limited to 'src/modules/evas')
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_engine.c16
1 files 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 e6a810c130..5f1f78aab9 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)
289 289
290 if ((ns->type == EVAS_NATIVE_SURFACE_OPENGL) && 290 if ((ns->type == EVAS_NATIVE_SURFACE_OPENGL) &&
291 (ns->version == EVAS_NATIVE_SURFACE_VERSION)) 291 (ns->version == EVAS_NATIVE_SURFACE_VERSION))
292 im2 = evas_cache_image_data(evas_common_image_cache_get(), 292 im2 = (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(),
293 ie->w, ie->h, 293 ie->w, ie->h,
294 ns->data.x11.visual, 1, 294 ns->data.x11.visual, 1,
295 EVAS_COLORSPACE_ARGB8888); 295 EVAS_COLORSPACE_ARGB8888);
296 else 296 else
297 im2 = evas_cache_image_data(evas_common_image_cache_get(), 297 im2 = (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(),
298 ie->w, ie->h, 298 ie->w, ie->h,
299 NULL, 1, 299 NULL, 1,
300 EVAS_COLORSPACE_ARGB8888); 300 EVAS_COLORSPACE_ARGB8888);
301 301
302 if (im->native.data) 302 if (im->native.data)
303 { 303 {