From 36886a339e8efa32a42b9bdae8ab733fc7d3fff9 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Wed, 22 Mar 2006 17:49:18 +0000 Subject: [PATCH] * Removed the cucul_t * argument from cucul_create_bitmap(). It's not needed. --- cucul/bitmap.c | 9 ++++----- cucul/cucul.h | 8 ++++---- src/aafire.c | 2 +- src/cacaball.c | 2 +- src/cacamoir.c | 2 +- src/cacaplas.c | 2 +- src/cacaview.c | 6 +++--- test/demo.c | 2 +- test/export.c | 2 +- test/gamma.c | 4 ++-- test/hsv.c | 2 +- 11 files changed, 20 insertions(+), 21 deletions(-) diff --git a/cucul/bitmap.c b/cucul/bitmap.c index 0abdb95..8012750 100644 --- a/cucul/bitmap.c +++ b/cucul/bitmap.c @@ -258,11 +258,10 @@ static float gammapow(float x, float y) * \param amask Bitmask for alpha values. * \return Bitmap object, or NULL upon error. */ -struct cucul_bitmap *cucul_create_bitmap(cucul_t *qq, - unsigned int bpp, unsigned int w, - unsigned int h, unsigned int pitch, - unsigned int rmask, unsigned int gmask, - unsigned int bmask, unsigned int amask) +struct cucul_bitmap *cucul_create_bitmap(unsigned int bpp, unsigned int w, + unsigned int h, unsigned int pitch, + unsigned int rmask, unsigned int gmask, + unsigned int bmask, unsigned int amask) { struct cucul_bitmap *bitmap; int i; diff --git a/cucul/cucul.h b/cucul/cucul.h index ccf5437..c907c1a 100644 --- a/cucul/cucul.h +++ b/cucul/cucul.h @@ -202,10 +202,10 @@ void cucul_free_sprite(struct cucul_sprite *); * * @{ */ struct cucul_bitmap; -struct cucul_bitmap *cucul_create_bitmap(cucul_t *, unsigned int, unsigned int, - unsigned int, unsigned int, - unsigned int, unsigned int, - unsigned int, unsigned int); +struct cucul_bitmap *cucul_create_bitmap(unsigned int, unsigned int, + unsigned int, unsigned int, + unsigned int, unsigned int, + unsigned int, unsigned int); void cucul_set_bitmap_palette(struct cucul_bitmap *, unsigned int r[], unsigned int g[], unsigned int b[], unsigned int a[]); diff --git a/src/aafire.c b/src/aafire.c index f1b939a..8c4f3ef 100644 --- a/src/aafire.c +++ b/src/aafire.c @@ -140,7 +140,7 @@ initialize (void) #endif #ifdef LIBCACA - cucul_bitmap = cucul_create_bitmap(qq, 8, XSIZ, YSIZ - 2, XSIZ, 0, 0, 0, 0); + cucul_bitmap = cucul_create_bitmap(8, XSIZ, YSIZ - 2, XSIZ, 0, 0, 0, 0); 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)); diff --git a/src/cacaball.c b/src/cacaball.c index 5324406..dbd11d5 100644 --- a/src/cacaball.c +++ b/src/cacaball.c @@ -69,7 +69,7 @@ int main(int argc, char **argv) /* Create a libcucul bitmap smaller than our pixel buffer, so that we * display only the interesting part of it */ - cucul_bitmap = cucul_create_bitmap(qq, 8, XSIZ - METASIZE, YSIZ - METASIZE, + cucul_bitmap = cucul_create_bitmap(8, XSIZ - METASIZE, YSIZ - METASIZE, XSIZ, 0, 0, 0, 0); /* Generate ball sprite */ diff --git a/src/cacamoir.c b/src/cacamoir.c index 315e1b1..86341df 100644 --- a/src/cacamoir.c +++ b/src/cacamoir.c @@ -63,7 +63,7 @@ int main (int argc, char **argv) draw_disc(i, (i / DISCTHICKNESS) % 2); /* Create a libcucul bitmap */ - bitmap = cucul_create_bitmap(qq, 8, XSIZ, YSIZ, XSIZ, 0, 0, 0, 0); + bitmap = cucul_create_bitmap(8, XSIZ, YSIZ, XSIZ, 0, 0, 0, 0); /* Main loop */ for(;;) diff --git a/src/cacaplas.c b/src/cacaplas.c index ed5d522..4557d0c 100644 --- a/src/cacaplas.c +++ b/src/cacaplas.c @@ -75,7 +75,7 @@ int main (int argc, char **argv) } /* Create a libcucul bitmap */ - bitmap = cucul_create_bitmap(qq, 8, XSIZ, YSIZ, XSIZ, 0, 0, 0, 0); + bitmap = cucul_create_bitmap(8, XSIZ, YSIZ, XSIZ, 0, 0, 0, 0); /* Main loop */ for(;;) diff --git a/src/cacaview.c b/src/cacaview.c index ccd994d..c4a5a27 100644 --- a/src/cacaview.c +++ b/src/cacaview.c @@ -545,7 +545,7 @@ static void load_image(char const *name) depth = 4; /* Create the libcucul bitmap */ - bitmap = cucul_create_bitmap(qq, bpp, w, h, depth * w, + bitmap = cucul_create_bitmap(bpp, w, h, depth * w, rmask, gmask, bmask, amask); if(!bitmap) { @@ -712,8 +712,8 @@ static void load_image(char const *name) fclose(fp); - /* Create the libcaca bitmap */ - bitmap = cucul_create_bitmap(qq, bpp, w, h, depth * w, + /* Create the libcucul bitmap */ + bitmap = cucul_create_bitmap(bpp, w, h, depth * w, rmask, gmask, bmask, amask); if(!bitmap) { diff --git a/test/demo.c b/test/demo.c index a255d85..223bdeb 100644 --- a/test/demo.c +++ b/test/demo.c @@ -536,7 +536,7 @@ static void demo_render(void) for(z = 0; z < 240; z++) draw_circle(buffer, xo, yo, z, 0x000000ff, 200); - bitmap = cucul_create_bitmap(qq, 32, 256, 256, 4 * 256, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000); + 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, (char *)buffer); cucul_free_bitmap(bitmap); } diff --git a/test/export.c b/test/export.c index cb92a25..a7878f4 100644 --- a/test/export.c +++ b/test/export.c @@ -80,7 +80,7 @@ int main(int argc, char *argv[]) } } - bitmap = cucul_create_bitmap(qq, 32, 256, 256, 4 * 256, + bitmap = cucul_create_bitmap(32, 256, 256, 4 * 256, 0x00ff0000, 0x0000ff00, 0x000000ff, 0x0); cucul_draw_bitmap(qq, 0, 0, cucul_get_width(qq) - 1, cucul_get_height(qq) - 1, diff --git a/test/gamma.c b/test/gamma.c index 2d1b23d..c6b1334 100644 --- a/test/gamma.c +++ b/test/gamma.c @@ -45,9 +45,9 @@ int main(void) buffer[x + 768] = (x << 16) | (0x00 << 8) | (0xff << 0); } - left = cucul_create_bitmap(qq, 32, 256, 4, 4 * 256, + left = cucul_create_bitmap(32, 256, 4, 4 * 256, 0x00ff0000, 0x0000ff00, 0x000000ff, 0x0); - right = cucul_create_bitmap(qq, 32, 256, 4, 4 * 256, + right = cucul_create_bitmap(32, 256, 4, 4 * 256, 0x00ff0000, 0x0000ff00, 0x000000ff, 0x0); caca_set_delay(kk, 20000); diff --git a/test/hsv.c b/test/hsv.c index 16f883c..14c4455 100644 --- a/test/hsv.c +++ b/test/hsv.c @@ -43,7 +43,7 @@ int main(void) buffer[y * 256 + x] = ((y * x / 256) << 16) | ((y * x / 256) << 8) | (x<< 0); } - bitmap = cucul_create_bitmap(qq, 32, 256, 256, 4 * 256, + bitmap = cucul_create_bitmap(32, 256, 256, 4 * 256, 0x00ff0000, 0x0000ff00, 0x000000ff, 0x0); cucul_draw_bitmap(qq, 0, 0, cucul_get_width(qq) - 1, cucul_get_height(qq) - 1,