From dcaccc744cc97d52ca5d2fb70b94338fbf4fb900 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Tue, 21 Mar 2006 09:52:32 +0000 Subject: [PATCH] * Got rid of useless parameters in cucul_*_bitmap and cucul_*_sprite. --- cucul/bitmap.c | 6 +++--- cucul/cucul.h | 13 +++++++------ cucul/sprite.c | 2 +- src/aafire.c | 2 +- src/cacaball.c | 4 ++-- src/cacamoir.c | 4 ++-- src/cacaplas.c | 4 ++-- src/cacaview.c | 4 ++-- test/demo.c | 6 +++--- test/export.c | 2 +- test/hsv.c | 2 +- 11 files changed, 25 insertions(+), 24 deletions(-) diff --git a/cucul/bitmap.c b/cucul/bitmap.c index bfdbd60..7dd679a 100644 --- a/cucul/bitmap.c +++ b/cucul/bitmap.c @@ -264,7 +264,7 @@ struct cucul_bitmap *cucul_create_bitmap(cucul_t *qq, * \param blue Array of 256 blue values. * \param alpha Array of 256 alpha values. */ -void cucul_set_bitmap_palette(cucul_t *qq, struct cucul_bitmap *bitmap, +void cucul_set_bitmap_palette(struct cucul_bitmap *bitmap, unsigned int red[], unsigned int green[], unsigned int blue[], unsigned int alpha[]) { @@ -302,7 +302,7 @@ void cucul_set_bitmap_palette(cucul_t *qq, struct cucul_bitmap *bitmap, * \param bitmap Bitmap object. * \param gamma Gamma value. */ -void cucul_set_bitmap_gamma(cucul_t *qq, struct cucul_bitmap *bitmap, float gamma) +void cucul_set_bitmap_gamma(struct cucul_bitmap *bitmap, float gamma) { int i; @@ -322,7 +322,7 @@ void cucul_set_bitmap_gamma(cucul_t *qq, struct cucul_bitmap *bitmap, float gamm * * \param bitmap Bitmap object. */ -void cucul_free_bitmap(cucul_t *qq, struct cucul_bitmap *bitmap) +void cucul_free_bitmap(struct cucul_bitmap *bitmap) { if(!bitmap) return; diff --git a/cucul/cucul.h b/cucul/cucul.h index 2839685..fda0a90 100644 --- a/cucul/cucul.h +++ b/cucul/cucul.h @@ -192,7 +192,8 @@ int cucul_get_sprite_width(cucul_t *, struct cucul_sprite const *, int); int cucul_get_sprite_height(cucul_t *, struct cucul_sprite const *, int); int cucul_get_sprite_dx(cucul_t *, struct cucul_sprite const *, int); int cucul_get_sprite_dy(cucul_t *, struct cucul_sprite const *, int); -void cucul_draw_sprite(cucul_t *, int, int, struct cucul_sprite const *, int);void cucul_free_sprite(cucul_t *, struct cucul_sprite *); +void cucul_draw_sprite(cucul_t *, int, int, struct cucul_sprite const *, int); +void cucul_free_sprite(struct cucul_sprite *); /* @} */ /** \defgroup bitmap Bitmap handling @@ -206,12 +207,12 @@ struct cucul_bitmap *cucul_create_bitmap(cucul_t *, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int); -void cucul_set_bitmap_palette(cucul_t *, struct cucul_bitmap *, - unsigned int r[], unsigned int g[], - unsigned int b[], unsigned int a[]); -void cucul_set_bitmap_gamma(cucul_t *, struct cucul_bitmap *, float); +void cucul_set_bitmap_palette(struct cucul_bitmap *, + unsigned int r[], unsigned int g[], + unsigned int b[], unsigned int a[]); +void cucul_set_bitmap_gamma(struct cucul_bitmap *, float); void cucul_draw_bitmap(cucul_t *, int, int, int, int, struct cucul_bitmap const *, void *); -void cucul_free_bitmap(cucul_t *, struct cucul_bitmap *); +void cucul_free_bitmap(struct cucul_bitmap *); /* @} */ /** \defgroup exporter Exporters to various formats diff --git a/cucul/sprite.c b/cucul/sprite.c index 3b13411..618cee2 100644 --- a/cucul/sprite.c +++ b/cucul/sprite.c @@ -301,7 +301,7 @@ void cucul_draw_sprite(cucul_t *qq, int x, int y, struct cucul_sprite const *spr * \param sprite The sprite to be freed. * \return void */ -void cucul_free_sprite(cucul_t *qq, struct cucul_sprite *sprite) +void cucul_free_sprite(struct cucul_sprite *sprite) { int i; diff --git a/src/aafire.c b/src/aafire.c index edf3b7b..2dd6262 100644 --- a/src/aafire.c +++ b/src/aafire.c @@ -141,7 +141,7 @@ initialize (void) #ifdef LIBCACA cucul_bitmap = cucul_create_bitmap(qq, 8, XSIZ, YSIZ - 2, XSIZ, 0, 0, 0, 0); - cucul_set_bitmap_palette(qq, cucul_bitmap, r, g, b, a); + cucul_set_bitmap_palette(cucul_bitmap, r, g, b, a); bitmap = malloc(4 * cucul_get_width(qq) * cucul_get_height(qq) * sizeof(char)); memset(bitmap, 0, 4 * cucul_get_width(qq) * cucul_get_height(qq)); #else diff --git a/src/cacaball.c b/src/cacaball.c index f4fcb4e..65eefd6 100644 --- a/src/cacaball.c +++ b/src/cacaball.c @@ -123,7 +123,7 @@ int main(int argc, char **argv) } /* Set the palette */ - cucul_set_bitmap_palette(qq, cucul_bitmap, r, g, b, a); + cucul_set_bitmap_palette(cucul_bitmap, r, g, b, a); /* Silly paths for our balls */ for(p = 0; p < METABALLS; p++) @@ -157,7 +157,7 @@ paused: /* End, bye folks */ end: - cucul_free_bitmap(qq, cucul_bitmap); + cucul_free_bitmap(cucul_bitmap); caca_detach(kk); cucul_end(qq); diff --git a/src/cacamoir.c b/src/cacamoir.c index 871c543..de1096b 100644 --- a/src/cacamoir.c +++ b/src/cacamoir.c @@ -88,7 +88,7 @@ int main (int argc, char **argv) green[1] = 0.5 * (1 + cos(0.06 * frame + 5.0)) * 0xfff; blue[1] = 0.5 * (1 + cos(0.05 * frame + 5.0)) * 0xfff; - cucul_set_bitmap_palette(qq, bitmap, red, green, blue, alpha); + cucul_set_bitmap_palette(bitmap, red, green, blue, alpha); /* Draw circles */ x = cos(0.07 * frame + 5.0) * 128.0 + (XSIZ / 2); @@ -109,7 +109,7 @@ paused: } end: - cucul_free_bitmap(qq, bitmap); + cucul_free_bitmap(bitmap); caca_detach(kk); cucul_end(qq); diff --git a/src/cacaplas.c b/src/cacaplas.c index 97f9e25..43fba63 100644 --- a/src/cacaplas.c +++ b/src/cacaplas.c @@ -99,7 +99,7 @@ int main (int argc, char **argv) } /* Set the palette */ - cucul_set_bitmap_palette(qq, bitmap, red, green, blue, alpha); + cucul_set_bitmap_palette(bitmap, red, green, blue, alpha); do_plasma(screen, (1.0 + sin(((double)frame) * R[0])) / 2, @@ -121,7 +121,7 @@ paused: } end: - cucul_free_bitmap(qq, bitmap); + cucul_free_bitmap(bitmap); caca_detach(kk); cucul_end(qq); diff --git a/src/cacaview.c b/src/cacaview.c index 1f0b8ab..268a60b 100644 --- a/src/cacaview.c +++ b/src/cacaview.c @@ -487,7 +487,7 @@ static void unload_image(void) pixels = NULL; #endif if(bitmap) - cucul_free_bitmap(qq, bitmap); + cucul_free_bitmap(bitmap); bitmap = NULL; } @@ -690,7 +690,7 @@ static void load_image(char const *name) } if(bpp == 8) - cucul_set_bitmap_palette(qq, bitmap, red, green, blue, alpha); + cucul_set_bitmap_palette(bitmap, red, green, blue, alpha); #endif } diff --git a/test/demo.c b/test/demo.c index 850e988..000bc9c 100644 --- a/test/demo.c +++ b/test/demo.c @@ -173,7 +173,7 @@ int main(int argc, char **argv) } /* Clean up */ - cucul_free_sprite(qq, sprite); + cucul_free_sprite(sprite); caca_detach(kk); cucul_end(qq); @@ -495,7 +495,7 @@ static void demo_render(void) bitmap = cucul_create_bitmap(32, 256, 256, 4 * 256, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000); cucul_draw_bitmap(qq, 0, 0, cucul_get_width(qq) - 1, cucul_get_height(qq) - 1, bitmap, buffer); - cucul_free_bitmap(qq, bitmap); + cucul_free_bitmap(bitmap); } #endif @@ -538,7 +538,7 @@ static void demo_render(void) bitmap = cucul_create_bitmap(qq, 32, 256, 256, 4 * 256, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000); cucul_draw_bitmap(qq, 0, 0, cucul_get_width(qq) - 1, cucul_get_height(qq) - 1, bitmap, (char *)buffer); - cucul_free_bitmap(qq, bitmap); + cucul_free_bitmap(bitmap); } static void draw_circle(int *buffer, int x, int y, int r, int mask, int val) diff --git a/test/export.c b/test/export.c index bdea4ce..3b46f85 100644 --- a/test/export.c +++ b/test/export.c @@ -85,7 +85,7 @@ int main(int argc, char *argv[]) cucul_draw_bitmap(qq, 0, 0, cucul_get_width(qq) - 1, cucul_get_height(qq) - 1, bitmap, pixels); - cucul_free_bitmap(qq, bitmap); + cucul_free_bitmap(bitmap); cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLACK); cucul_draw_thin_box(qq, 0, 0, WIDTH - 1, HEIGHT - 1); diff --git a/test/hsv.c b/test/hsv.c index 4a2dac2..1b27562 100644 --- a/test/hsv.c +++ b/test/hsv.c @@ -48,7 +48,7 @@ int main(void) cucul_draw_bitmap(qq, 0, 0, cucul_get_width(qq) - 1, cucul_get_height(qq) - 1, bitmap, buffer); - cucul_free_bitmap(qq, bitmap); + cucul_free_bitmap(bitmap); caca_display(kk);