summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorSean Fox <dyntryx@gmail.com>2008-06-27 04:27:02 +0000
committerSean Fox <dyntryx@gmail.com>2008-06-27 04:27:02 +0000
commitffa9d8a81bb73d3ee2e9c0f010bd035ff173e6f7 (patch)
treedce4ce5b52206347444fada33007cf7a8dfa69e9 /examples
parent3bd20517eb94e2d44b68e4cafdf98ffb37936171 (diff)
downloadlibnsbmp-ffa9d8a81bb73d3ee2e9c0f010bd035ff173e6f7.tar.gz
libnsbmp-ffa9d8a81bb73d3ee2e9c0f010bd035ff173e6f7.tar.bz2
Arranged bmp_image members, moved bitmap callbacks into bmp_image
svn path=/branches/dynis/libnsbmp/; revision=4463
Diffstat (limited to 'examples')
-rw-r--r--examples/decode_bmp.c26
1 files changed, 11 insertions, 15 deletions
diff --git a/examples/decode_bmp.c b/examples/decode_bmp.c
index 685d75a..7ee2f8b 100644
--- a/examples/decode_bmp.c
+++ b/examples/decode_bmp.c
@@ -38,20 +38,16 @@ unsigned char *bitmap_get_buffer(void *bitmap);
size_t bitmap_get_bpp(void *bitmap);
void bitmap_destroy(void *bitmap);
-/* The Bitmap callbacks function table;
- necessary for interaction with nsgiflib.
-*/
-bmp_bitmap_callback_vt bitmap_callbacks = {
- bitmap_create,
- bitmap_destroy,
- bitmap_set_suspendable,
- bitmap_get_buffer,
- bitmap_get_bpp
-};
-
int main(int argc, char *argv[])
{
+ bmp_bitmap_callback_vt bitmap_callbacks = {
+ bitmap_create,
+ bitmap_destroy,
+ bitmap_set_suspendable,
+ bitmap_get_buffer,
+ bitmap_get_bpp
+ };
bmp_result code;
bmp_image bmp;
size_t size;
@@ -62,7 +58,7 @@ int main(int argc, char *argv[])
}
/* create our bmp image */
- bmp_create(&bmp);
+ bmp_create(&bmp, &bitmap_callbacks);
/* load file into memory */
unsigned char *data = load_file(argv[1], &size);
@@ -72,7 +68,7 @@ int main(int argc, char *argv[])
bmp.buffer_size = size;
/* analyse the BMP */
- code = bmp_analyse(&bmp, &bitmap_callbacks);
+ code = bmp_analyse(&bmp);
if (code != BMP_OK) {
warning("bmp_analyse", code);
exit(1);
@@ -85,7 +81,7 @@ int main(int argc, char *argv[])
printf("%u %u 256\n", bmp.width, bmp.height);
/* decode the image */
- code = bmp_decode(&bmp, &bitmap_callbacks);
+ code = bmp_decode(&bmp);
if (code != BMP_OK) {
warning("bmp_decode", code);
exit(1);
@@ -107,7 +103,7 @@ int main(int argc, char *argv[])
}
/* clean up */
- bmp_finalise(&bmp, &bitmap_callbacks);
+ bmp_finalise(&bmp);
free(data);
return 0;