Altered bitmap callback table structure name for libnsgif to avoid ambiguity when bmp library is created

svn path=/branches/dynis/libnsgif/; revision=4390

2 files changed, 12 insertions, 12 deletions

diff --git a/libnsgif.c b/libnsgif.c
index 4302168..8711e94 100644
--- a/libnsgif.c
+++ b/libnsgif.c
@@ -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)
diff --git a/libnsgif.h b/libnsgif.h
index c02d229..dd5d759 100644
--- a/libnsgif.h
+++ b/libnsgif.h
@@ -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