From bfcc99ef22290559f976b89e58d55c532ba0c900 Mon Sep 17 00:00:00 2001 From: barbieri Date: Sun, 19 Sep 2010 20:11:42 +0000 Subject: [PATCH] warnings-- on 16bpp and 8bpp git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@52472 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/modules/engines/software_16_sdl/evas_engine.c | 3 +-- src/modules/engines/software_8/evas_engine.c | 5 +++-- src/modules/engines/software_sdl/evas_engine.c | 7 +++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/modules/engines/software_16_sdl/evas_engine.c b/src/modules/engines/software_16_sdl/evas_engine.c index d3cc0d3..79bcefa 100644 --- a/src/modules/engines/software_16_sdl/evas_engine.c +++ b/src/modules/engines/software_16_sdl/evas_engine.c @@ -10,8 +10,7 @@ int _evas_engine_soft16_sdl_log_dom = -1; /* function tables - filled in later (func and parent func) */ -static Evas_Func func = {}; -static Evas_Func pfunc = {}; +static Evas_Func func, pfunc; static Engine_Image_Entry *_sdl16_image_alloc (void); static void _sdl16_image_delete (Engine_Image_Entry *eim); diff --git a/src/modules/engines/software_8/evas_engine.c b/src/modules/engines/software_8/evas_engine.c index 3681041..9ccf4e4 100644 --- a/src/modules/engines/software_8/evas_engine.c +++ b/src/modules/engines/software_8/evas_engine.c @@ -278,11 +278,12 @@ eng_image_colorspace_set(void *data __UNUSED__, void *image __UNUSED__, NOT_IMPLEMENTED(); } -static void -eng_image_native_set(void *data __UNUSED__, void *image __UNUSED__, +static void * +eng_image_native_set(void *data __UNUSED__, void *image, void *native __UNUSED__) { NOT_IMPLEMENTED(); + return image; } static void * diff --git a/src/modules/engines/software_sdl/evas_engine.c b/src/modules/engines/software_sdl/evas_engine.c index 85d6067..9740ec6 100644 --- a/src/modules/engines/software_sdl/evas_engine.c +++ b/src/modules/engines/software_sdl/evas_engine.c @@ -11,8 +11,7 @@ int _evas_engine_soft_sdl_log_dom = -1; /* #define DEBUG_SDL */ -static Evas_Func func = {}; -static Evas_Func pfunc = {}; +static Evas_Func func, pfunc; static void* _sdl_output_setup (int w, int h, int fullscreen, int noframe, int alpha, int hwsurface); @@ -22,7 +21,7 @@ static void _sdl_image_delete (Engine_Image_Entry *eim static int _sdl_image_constructor (Engine_Image_Entry*, void* data); static void _sdl_image_destructor (Engine_Image_Entry *eim); -static void _sdl_image_dirty_region(Engine_Image_Entry *eim, int x, int y, int w, int h); +static void _sdl_image_dirty_region(Engine_Image_Entry *eim, unsigned int x, unsigned int y, unsigned int w, unsigned int h); static int _sdl_image_dirty (Engine_Image_Entry *dst, const Engine_Image_Entry *src); @@ -281,7 +280,7 @@ evas_engine_sdl_output_redraws_next_update_push (void *data, void *surface __UNU } static void -_sdl_image_dirty_region(Engine_Image_Entry *eim, int x, int y, int w, int h) +_sdl_image_dirty_region(Engine_Image_Entry *eim, unsigned int x, unsigned int y, unsigned int w, unsigned int h) { SDL_Engine_Image_Entry *dst; RGBA_Image *im; -- 2.7.4