notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Making Magic Tool source throw less compiler warnings.

Browse source
This commit is contained in:
William Kendrick 2008-05-06 15:29:46 +00:00
parent db0be1a571
commit ddc7bab3d5
3 changed files with 43 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/CHANGES.txt
View file

@ -64,6 +64,8 @@ $Id$
* Makefile improvements. * Makefile improvements.
Albert Cahalan <albert@users.sf.net> Albert Cahalan <albert@users.sf.net>
* Making Magic Tool source throw less compiler warnings.
* Documentation Improvements: * Documentation Improvements:
--------------------------- ---------------------------
* Mentioned that canvas size can be changed in README (so it's not * Mentioned that canvas size can be changed in README (so it's not

49
magic/src/blocks_chalk_drip.c
View file

@ -4,7 +4,7 @@
Blocks, Chalk and Drip Magic Tools Plugin Blocks, Chalk and Drip Magic Tools Plugin
Tux Paint - A simple drawing program for children. Tux Paint - A simple drawing program for children.
Copyright (c) 2002-2007 by Bill Kendrick and others; see AUTHORS.txt Copyright (c) 2002-2008 by Bill Kendrick and others; see AUTHORS.txt
bill@newbreedsoftware.com bill@newbreedsoftware.com
http://www.tuxpaint.org/ http://www.tuxpaint.org/
@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: August 21, 2007 Last updated: May 6, 2008
$Id$ $Id$
*/ */
@ -49,6 +49,31 @@ enum {
static Mix_Chunk * snd_effect[NUM_TOOLS]; static Mix_Chunk * snd_effect[NUM_TOOLS];
/* Our function prototypes: */
int blocks_chalk_drip_init(magic_api * api);
Uint32 blocks_chalk_drip_api_version(void);
int blocks_chalk_drip_get_tool_count(magic_api * api);
SDL_Surface * blocks_chalk_drip_get_icon(magic_api * api, int which);
char * blocks_chalk_drip_get_name(magic_api * api, int which);
char * blocks_chalk_drip_get_description(magic_api * api, int which);
static void blocks_chalk_drip_linecb(void * ptr, int which,
SDL_Surface * canvas, SDL_Surface * last,
int x, int y);
void blocks_chalk_drip_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 blocks_chalk_drip_click(magic_api * api, int which,
SDL_Surface * canvas, SDL_Surface * last,
int x, int y, SDL_Rect * update_rect);
void blocks_chalk_drip_release(magic_api * api, int which,
SDL_Surface * canvas, SDL_Surface * last,
int x, int y, SDL_Rect * update_rect);
void blocks_chalk_drip_shutdown(magic_api * api);
void blocks_chalk_drip_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b);
int blocks_chalk_drip_requires_colors(magic_api * api, int which);
int blocks_chalk_drip_init(magic_api * api) int blocks_chalk_drip_init(magic_api * api)
{ {
char fname[1024]; char fname[1024];
@ -72,7 +97,7 @@ Uint32 blocks_chalk_drip_api_version(void) { return(TP_MAGIC_API_VERSION); }
// We have multiple tools: // We have multiple tools:
int blocks_chalk_drip_get_tool_count(magic_api * api) int blocks_chalk_drip_get_tool_count(magic_api * api ATTRIBUTE_UNUSED)
{ {
return(NUM_TOOLS); return(NUM_TOOLS);
} }
@ -102,7 +127,7 @@ SDL_Surface * blocks_chalk_drip_get_icon(magic_api * api, int which)
} }
// Return our names, localized: // Return our names, localized:
char * blocks_chalk_drip_get_name(magic_api * api, int which) char * blocks_chalk_drip_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
{ {
if (which == TOOL_BLOCKS) if (which == TOOL_BLOCKS)
return(strdup(gettext("Blocks"))); return(strdup(gettext("Blocks")));
@ -115,7 +140,7 @@ char * blocks_chalk_drip_get_name(magic_api * api, int which)
} }
// Return our descriptions, localized: // Return our descriptions, localized:
char * blocks_chalk_drip_get_description(magic_api * api, int which) char * blocks_chalk_drip_get_description(magic_api * api ATTRIBUTE_UNUSED, int which)
{ {
if (which == TOOL_BLOCKS) if (which == TOOL_BLOCKS)
return(strdup(gettext( return(strdup(gettext(
@ -269,14 +294,14 @@ void blocks_chalk_drip_click(magic_api * api, int which,
} }
// Affect the canvas on release: // Affect the canvas on release:
void blocks_chalk_drip_release(magic_api * api, int which, void blocks_chalk_drip_release(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED,
SDL_Surface * canvas, SDL_Surface * last, SDL_Surface * canvas ATTRIBUTE_UNUSED, SDL_Surface * last ATTRIBUTE_UNUSED,
int x, int y, SDL_Rect * update_rect) int x ATTRIBUTE_UNUSED, int y ATTRIBUTE_UNUSED, SDL_Rect * update_rect ATTRIBUTE_UNUSED)
{ {
} }
// No setup happened: // No setup happened:
void blocks_chalk_drip_shutdown(magic_api * api) void blocks_chalk_drip_shutdown(magic_api * api ATTRIBUTE_UNUSED)
{ {
if (snd_effect[0] != NULL) if (snd_effect[0] != NULL)
Mix_FreeChunk(snd_effect[0]); Mix_FreeChunk(snd_effect[0]);
@ -286,13 +311,13 @@ void blocks_chalk_drip_shutdown(magic_api * api)
} }
// Record the color from Tux Paint: // Record the color from Tux Paint:
void blocks_chalk_drip_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b) void blocks_chalk_drip_set_color(magic_api * api ATTRIBUTE_UNUSED,
Uint8 r ATTRIBUTE_UNUSED, Uint8 g ATTRIBUTE_UNUSED, Uint8 b ATTRIBUTE_UNUSED)
{ {
} }
// Use colors: // Use colors:
int blocks_chalk_drip_requires_colors(magic_api * api, int which) int blocks_chalk_drip_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return 0; return 0;
} }

4
src/tp_magic_api.h.in
View file

@ -134,5 +134,9 @@ typedef struct magic_api_t {
#define TP_MAGIC_API_VERSION __APIVERSION__ #define TP_MAGIC_API_VERSION __APIVERSION__
#ifndef ATTRIBUTE_UNUSED
#define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
#endif /* ATTRIBUTE_UNUSED */
#endif #endif