diff options
author | Sean Fox <dyntryx@gmail.com> | 2008-06-18 19:04:19 +0000 |
---|---|---|
committer | Sean Fox <dyntryx@gmail.com> | 2008-06-18 19:04:19 +0000 |
commit | a37a2ca5e25a2691e28135cb7c3c4d92506cc736 (patch) | |
tree | b2aa38e2eb62d5ba22dc4f5fd94dd96aa284d40a | |
parent | 86669218477dc1c5b7e10f724606c3191697024a (diff) | |
download | libnsgif-a37a2ca5e25a2691e28135cb7c3c4d92506cc736.tar.gz libnsgif-a37a2ca5e25a2691e28135cb7c3c4d92506cc736.tar.bz2 |
Altered bitmap callback table structure name for libnsgif to avoid ambiguity when bmp library is created
svn path=/branches/dynis/libnsgif/; revision=4390
-rw-r--r-- | libnsgif.c | 14 | ||||
-rw-r--r-- | libnsgif.h | 10 |
2 files changed, 12 insertions, 12 deletions
@@ -67,8 +67,8 @@ /* Internal GIF routines */ -static int gif_initialise_sprite(struct gif_animation *gif, unsigned int width, unsigned int height, bitmap_callback_vt *bitmap_callbacks); -static int gif_initialise_frame(struct gif_animation *gif, bitmap_callback_vt *bitmap_callbacks); +static int gif_initialise_sprite(struct gif_animation *gif, unsigned int width, unsigned int height, gif_bitmap_callback_vt *bitmap_callbacks); +static int gif_initialise_frame(struct gif_animation *gif, gif_bitmap_callback_vt *bitmap_callbacks); static unsigned int gif_interlaced_line(int height, int y); @@ -116,7 +116,7 @@ static bool clear_image = false; 0 for successful decoding 1 for successful decoding (all frames completely read) */ -int gif_initialise(struct gif_animation *gif, bitmap_callback_vt *bitmap_callbacks) { +int gif_initialise(struct gif_animation *gif, gif_bitmap_callback_vt *bitmap_callbacks) { unsigned char *gif_data; unsigned int index; int return_value; @@ -276,7 +276,7 @@ int gif_initialise(struct gif_animation *gif, bitmap_callback_vt *bitmap_callbac @return -3 for a memory error 0 for success */ -static int gif_initialise_sprite(struct gif_animation *gif, unsigned int width, unsigned int height, bitmap_callback_vt *bitmap_callbacks) { +static int gif_initialise_sprite(struct gif_animation *gif, unsigned int width, unsigned int height, gif_bitmap_callback_vt *bitmap_callbacks) { unsigned int max_width; unsigned int max_height; struct bitmap *buffer; @@ -316,7 +316,7 @@ static int gif_initialise_sprite(struct gif_animation *gif, unsigned int width, 0 for success 1 for success (GIF terminator found) */ -int gif_initialise_frame(struct gif_animation *gif, bitmap_callback_vt *bitmap_callbacks) { +int gif_initialise_frame(struct gif_animation *gif, gif_bitmap_callback_vt *bitmap_callbacks) { int frame; gif_frame *temp_buf; @@ -543,7 +543,7 @@ int gif_initialise_frame(struct gif_animation *gif, bitmap_callback_vt *bitmap_c GIF_INSUFFICIENT_DATA for insufficient data to do anything 0 for successful decoding */ -int gif_decode_frame(struct gif_animation *gif, unsigned int frame, bitmap_callback_vt *bitmap_callbacks) { +int gif_decode_frame(struct gif_animation *gif, unsigned int frame, gif_bitmap_callback_vt *bitmap_callbacks) { unsigned int index = 0; unsigned char *gif_data; unsigned char *gif_end; @@ -842,7 +842,7 @@ static unsigned int gif_interlaced_line(int height, int y) { /* Releases any workspace held by the animation */ -void gif_finalise(struct gif_animation *gif, bitmap_callback_vt *bitmap_callbacks) { +void gif_finalise(struct gif_animation *gif, gif_bitmap_callback_vt *bitmap_callbacks) { /* Release all our memory blocks */ if (gif->frame_image) @@ -67,14 +67,14 @@ typedef void (*bitmap_cb_modified)(void *bitmap); /* The Bitmap callbacks function table */ -typedef struct bitmap_callback_vt_s { +typedef struct gif_bitmap_callback_vt_s { bitmap_cb_create bitmap_create; /**< Create a bitmap. */ bitmap_cb_destroy bitmap_destroy; /**< Free a bitmap. */ bitmap_cb_get_buffer bitmap_get_buffer; /**< Return a pointer to the pixel data in a bitmap. */ bitmap_cb_set_opaque bitmap_set_opaque; /**< Sets whether a bitmap should be plotted opaque. */ bitmap_cb_test_opaque bitmap_test_opaque; /**< Tests whether a bitmap has an opaque alpha channel. */ bitmap_cb_modified bitmap_modified; /**< The bitmap image has changed, so flush any persistant cache. */ -} bitmap_callback_vt; +} gif_bitmap_callback_vt; /* The GIF animation data */ @@ -101,8 +101,8 @@ typedef struct gif_animation { int current_error; /**< current error type, or 0 for none*/ } gif_animation; -int gif_initialise(struct gif_animation *gif, bitmap_callback_vt *bitmap_callbacks); -int gif_decode_frame(struct gif_animation *gif, unsigned int frame, bitmap_callback_vt *bitmap_callbacks); -void gif_finalise(struct gif_animation *gif, bitmap_callback_vt *bitmap_callbacks); +int gif_initialise(struct gif_animation *gif, gif_bitmap_callback_vt *bitmap_callbacks); +int gif_decode_frame(struct gif_animation *gif, unsigned int frame, gif_bitmap_callback_vt *bitmap_callbacks); +void gif_finalise(struct gif_animation *gif, gif_bitmap_callback_vt *bitmap_callbacks); #endif |