From 712e8295e9738eb9bb323c19d58f1e6d40a8ddb4 Mon Sep 17 00:00:00 2001 From: Pere Pujal i Carabantes Date: Sat, 17 Dec 2011 23:46:13 +0000 Subject: [PATCH] Removing warnings on magic smudge and sharpen by finaiized as a task in GCI --- magic/src/sharpen.c | 56 ++++++++++++++++++++++++++++++++++----------- magic/src/smudge.c | 49 ++++++++++++++++++++++++++++----------- 2 files changed, 79 insertions(+), 26 deletions(-) diff --git a/magic/src/sharpen.c b/magic/src/sharpen.c index 40ab7d633..8eb159526 100644 --- a/magic/src/sharpen.c +++ b/magic/src/sharpen.c @@ -83,6 +83,36 @@ const char * sharpen_descs[sharpen_NUM_TOOLS][2] = { gettext_noop("Click to create a black and white silhouette of your entire picture.")}, }; +Uint32 sharpen_api_version(void); +int sharpen_init(magic_api * api); +int sharpen_get_tool_count(magic_api * api); +SDL_Surface * sharpen_get_icon(magic_api * api, int which); +char * sharpen_get_name(magic_api * api, int which); +char * sharpen_get_description(magic_api * api, int which, int mode); +static int sharpen_grey(Uint8 r1,Uint8 g1,Uint8 b1); +static void do_sharpen_pixel(void * ptr, int which, + SDL_Surface * canvas, SDL_Surface * last, + int x, int y); +static void do_sharpen_full(void * ptr,SDL_Surface * canvas, SDL_Surface * last, int which); +static void do_sharpen_brush(void * ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y); +void sharpen_drag(magic_api * api, int which, SDL_Surface * canvas, + SDL_Surface * last, int ox, int oy, int x, int y, + SDL_Rect * update_rect); +void sharpen_click(magic_api * api, int which, int mode, + SDL_Surface * canvas, SDL_Surface * last, + int x, int y, SDL_Rect * update_rect); + +void sharpen_release(magic_api * api, int which, + SDL_Surface * canvas, SDL_Surface * last, + int x, int y, SDL_Rect * update_rect); + +void sharpen_shutdown(magic_api * api); +void sharpen_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b); +int sharpen_requires_colors(magic_api * api, int which); +void sharpen_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas); +void sharpen_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas); +int sharpen_modes(magic_api * api, int which); + Uint32 sharpen_api_version(void) { return(TP_MAGIC_API_VERSION); } @@ -101,7 +131,7 @@ int sharpen_init(magic_api * api){ } // We have multiple tools: -int sharpen_get_tool_count(magic_api * api) +int sharpen_get_tool_count(magic_api * api ATTRIBUTE_UNUSED) { return(sharpen_NUM_TOOLS); } @@ -114,12 +144,12 @@ SDL_Surface * sharpen_get_icon(magic_api * api, int which){ } // Return our names, localized: -char * sharpen_get_name(magic_api * api, int which){ +char * sharpen_get_name(magic_api * api ATTRIBUTE_UNUSED, int which){ return(strdup(gettext_noop(sharpen_names[which]))); } // Return our descriptions, localized: -char * sharpen_get_description(magic_api * api, int which, int mode){ +char * sharpen_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode){ return(strdup(gettext_noop(sharpen_descs[which][mode-1]))); } @@ -186,7 +216,7 @@ static void do_sharpen_pixel(void * ptr, int which, // Do the effect for the full image static void do_sharpen_full(void * ptr,SDL_Surface * canvas, SDL_Surface * last, int which){ - magic_api * api = (magic_api *) ptr; + // magic_api * api = (magic_api *) ptr; int x,y; @@ -250,14 +280,14 @@ void sharpen_click(magic_api * api, int which, int mode, } // Affect the canvas on release: -void sharpen_release(magic_api * api, int which, - SDL_Surface * canvas, SDL_Surface * last, - int x, int y, SDL_Rect * update_rect) +void sharpen_release(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, + SDL_Surface * canvas ATTRIBUTE_UNUSED, SDL_Surface * last ATTRIBUTE_UNUSED, + int x ATTRIBUTE_UNUSED, int y ATTRIBUTE_UNUSED, SDL_Rect * update_rect ATTRIBUTE_UNUSED) { } // No setup happened: -void sharpen_shutdown(magic_api * api) +void sharpen_shutdown(magic_api * api ATTRIBUTE_UNUSED) { //Clean up sounds int i; @@ -269,25 +299,25 @@ void sharpen_shutdown(magic_api * api) } // Record the color from Tux Paint: -void sharpen_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b) +void sharpen_set_color(magic_api * api ATTRIBUTE_UNUSED, Uint8 r ATTRIBUTE_UNUSED, Uint8 g ATTRIBUTE_UNUSED, Uint8 b ATTRIBUTE_UNUSED) { } // Use colors: -int sharpen_requires_colors(magic_api * api, int which) +int sharpen_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) { return 0; } -void sharpen_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas) +void sharpen_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED) { } -void sharpen_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas) +void sharpen_switchout(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED) { } -int sharpen_modes(magic_api * api, int which) +int sharpen_modes(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) { return(MODE_FULLSCREEN|MODE_PAINT); } diff --git a/magic/src/smudge.c b/magic/src/smudge.c index 6db328dba..80111c602 100644 --- a/magic/src/smudge.c +++ b/magic/src/smudge.c @@ -40,6 +40,29 @@ static Mix_Chunk * smudge_snd; static Uint8 smudge_r, smudge_g, smudge_b; +int smudge_init(magic_api * api); +Uint32 smudge_api_version(void); +SDL_Surface * smudge_get_icon(magic_api * api, int which); +char * smudge_get_name(magic_api * api, int which); +char * smudge_get_description(magic_api * api, int which, int mode); +static void do_smudge(void * ptr, int which, SDL_Surface * canvas, SDL_Surface * last, + int x, int y); +void smudge_drag(magic_api * api, int which, SDL_Surface * canvas, + SDL_Surface * last, int ox, int oy, int x, int y, + SDL_Rect * update_rect); +void smudge_click(magic_api * api, int which, int mode, + SDL_Surface * canvas, SDL_Surface * last, + int x, int y, SDL_Rect * update_rect); +void smudge_release(magic_api * api, int which, + SDL_Surface * canvas, SDL_Surface * last, + int x, int y, SDL_Rect * update_rect); +void smudge_shutdown(magic_api * api); +void smudge_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b); +int smudge_requires_colors(magic_api * api, int which); +void smudge_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas); +void smudge_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas); +int smudge_modes(magic_api * api, int which); +int smudge_get_tool_count(magic_api * api); // No setup required: int smudge_init(magic_api * api) @@ -56,7 +79,7 @@ int smudge_init(magic_api * api) Uint32 smudge_api_version(void) { return(TP_MAGIC_API_VERSION); } // We have multiple tools: -int smudge_get_tool_count(magic_api * api) +int smudge_get_tool_count(magic_api * api ATTRIBUTE_UNUSED) { return(2); } @@ -77,7 +100,7 @@ SDL_Surface * smudge_get_icon(magic_api * api, int which) } // Return our names, localized: -char * smudge_get_name(magic_api * api, int which) +char * smudge_get_name(magic_api * api ATTRIBUTE_UNUSED, int which) { if (which == 0) return(strdup(gettext_noop("Smudge"))); @@ -86,7 +109,7 @@ char * smudge_get_name(magic_api * api, int which) } // Return our descriptions, localized: -char * smudge_get_description(magic_api * api, int which, int mode) +char * smudge_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode ATTRIBUTE_UNUSED) { if (which == 0) return(strdup(gettext_noop("Click and move the mouse around to smudge the picture."))); @@ -169,7 +192,7 @@ void smudge_drag(magic_api * api, int which, SDL_Surface * canvas, } // Affect the canvas on click: -void smudge_click(magic_api * api, int which, int mode, +void smudge_click(magic_api * api, int which, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas, SDL_Surface * last, int x, int y, SDL_Rect * update_rect) { @@ -177,21 +200,21 @@ void smudge_click(magic_api * api, int which, int mode, } // Affect the canvas on click: -void smudge_release(magic_api * api, int which, - SDL_Surface * canvas, SDL_Surface * last, - int x, int y, SDL_Rect * update_rect) +void smudge_release(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, + SDL_Surface * canvas ATTRIBUTE_UNUSED, SDL_Surface * last ATTRIBUTE_UNUSED, + int x ATTRIBUTE_UNUSED, int y ATTRIBUTE_UNUSED, SDL_Rect * update_rect ATTRIBUTE_UNUSED) { } // No setup happened: -void smudge_shutdown(magic_api * api) +void smudge_shutdown(magic_api * api ATTRIBUTE_UNUSED) { if (smudge_snd != NULL) Mix_FreeChunk(smudge_snd); } // Record the color from Tux Paint: -void smudge_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b) +void smudge_set_color(magic_api * api ATTRIBUTE_UNUSED, Uint8 r, Uint8 g, Uint8 b) { smudge_r = r; smudge_g = g; @@ -199,7 +222,7 @@ void smudge_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b) } // Use colors: -int smudge_requires_colors(magic_api * api, int which) +int smudge_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) { if (which == 0) return 0; @@ -207,15 +230,15 @@ int smudge_requires_colors(magic_api * api, int which) return 1; } -void smudge_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas) +void smudge_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED) { } -void smudge_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas) +void smudge_switchout(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED) { } -int smudge_modes(magic_api * api, int which) +int smudge_modes(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) { return(MODE_PAINT); }