From 49a53f68bc12c0eb6ed25ac0f06862f761690596 Mon Sep 17 00:00:00 2001 From: Jean-Yves Lamoureux Date: Thu, 17 Nov 2005 14:13:54 +0000 Subject: [PATCH] * Fixed a bunch of warnings --- src/bitmap.c | 31 ------------------------------- src/event.c | 1 + src/graphics.c | 3 ++- 3 files changed, 3 insertions(+), 32 deletions(-) diff --git a/src/bitmap.c b/src/bitmap.c index 6968b97..5d03dfc 100644 --- a/src/bitmap.c +++ b/src/bitmap.c @@ -471,37 +471,6 @@ void caca_draw_bitmap(int x1, int y1, int x2, int y2, int *floyd_steinberg, *fs_r, *fs_g, *fs_b; int fs_length; - /* Only used when background is black */ - static int const white_colors[] = - { - CACA_COLOR_BLACK, - CACA_COLOR_DARKGRAY, - CACA_COLOR_LIGHTGRAY, - CACA_COLOR_WHITE - }; - - static int const light_colors[] = - { - CACA_COLOR_LIGHTMAGENTA, - CACA_COLOR_LIGHTRED, - CACA_COLOR_YELLOW, - CACA_COLOR_LIGHTGREEN, - CACA_COLOR_LIGHTCYAN, - CACA_COLOR_LIGHTBLUE, - CACA_COLOR_LIGHTMAGENTA - }; - - static int const dark_colors[] = - { - CACA_COLOR_MAGENTA, - CACA_COLOR_RED, - CACA_COLOR_BROWN, - CACA_COLOR_GREEN, - CACA_COLOR_CYAN, - CACA_COLOR_BLUE, - CACA_COLOR_MAGENTA - }; - /* FIXME: choose better characters! */ #if !defined(_DOXYGEN_SKIP_ME) # define DCHMAX ((sizeof(density_chars)/sizeof(char const)/4)-1) diff --git a/src/event.c b/src/event.c index 6640751..8307c58 100644 --- a/src/event.c +++ b/src/event.c @@ -57,6 +57,7 @@ #if defined(USE_GL) #include #include +#include extern int gl_special_key; extern unsigned char gl_key; extern unsigned char gl_resized; diff --git a/src/graphics.c b/src/graphics.c index f6a5bff..c54a227 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -61,6 +61,7 @@ #if defined(USE_GL) # include # include +# include #endif #if defined(HAVE_INTTYPES_H) || defined(_DOXYGEN_SKIP_ME) # include @@ -1904,7 +1905,7 @@ char* caca_get_html3(void) for(x = 0; x < _caca_width; x += len) { - int i; + unsigned int i; /* Use colspan option to factorize cells with same attributes * (see below) */