Merged revisions 4345-4346,4350-4351,4389,4391,4395,4401-4403,4423,4485-4486 via svnmerge from

svn://semichrome.net/branches/dynis/netsurf

........
  r4345 | dynis | 2008-06-15 18:37:23 -0500 (Sun, 15 Jun 2008) | 1 line
  
  Move NetSurf's gifread.h to libnsgif
........
  r4346 | dynis | 2008-06-15 18:38:38 -0500 (Sun, 15 Jun 2008) | 1 line
  
  Remove NetSurf's gifread.c (replaced by libnsgif)
........
  r4350 | dynis | 2008-06-15 18:57:17 -0500 (Sun, 15 Jun 2008) | 1 line
  
  Added references to libnsgif where necessary; corrected function calls where callbacks were implemented
........
  r4351 | dynis | 2008-06-15 19:00:33 -0500 (Sun, 15 Jun 2008) | 1 line
  
  Updated Makefile to compile with libnsgif
........
  r4389 | dynis | 2008-06-18 13:58:51 -0500 (Wed, 18 Jun 2008) | 1 line
  
  Altered bitmap callback table name for gif images to avoid ambiguity when bmp image library is created
........
  r4391 | dynis | 2008-06-18 14:08:39 -0500 (Wed, 18 Jun 2008) | 1 line
  
  Updated netsurf branch to use new bitmap callback table structure name that was altered in libnsgif
........
  r4395 | dynis | 2008-06-18 14:54:51 -0500 (Wed, 18 Jun 2008) | 1 line
  
  Corrected param comments for bitmap_set_suspendable()
........
  r4401 | dynis | 2008-06-18 18:39:50 -0500 (Wed, 18 Jun 2008) | 1 line
  
  Added references to libnsbmp where necessary; corrected function calls where callbacks were implemented
........
  r4402 | dynis | 2008-06-18 18:40:47 -0500 (Wed, 18 Jun 2008) | 1 line
  
  Updated Makefile to compile with libnsbmp
........
  r4403 | dynis | 2008-06-18 18:41:53 -0500 (Wed, 18 Jun 2008) | 1 line
  
  Remove NetSurf's bmpread.c and bmpread.h (replaced by libnsbmp)
........
  r4423 | dynis | 2008-06-22 14:21:30 -0500 (Sun, 22 Jun 2008) | 1 line
  
  Correct a silly mistake in nsbmp_bitmap_create
........
  r4485 | dynis | 2008-07-01 04:13:48 -0500 (Tue, 01 Jul 2008) | 1 line
  
  Integrated the latest versions of libnsgif and libnsbmp into NetSurf
........
  r4486 | dynis | 2008-07-01 05:27:10 -0500 (Tue, 01 Jul 2008) | 1 line
  
  Altered bitmap functions to receive void pointers for proper utilisation of libnsgif and libnsbmp
........

svn path=/trunk/netsurf/; revision=5071

1 files changed, 0 insertions, 88 deletions

diff --git a/image/gifread.h b/image/gifread.h
deleted file mode 100644
index 292c5a86d..000000000
--- a/image/gifread.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2004 Richard Wilson <not_ginger_matt@users.sourceforge.net>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/** \file
- * Progressive animated GIF file decoding (interface).
- */
-
-#ifndef _NETSURF_IMAGE_GIFREAD_H_
-#define _NETSURF_IMAGE_GIFREAD_H_
-
-#include <stdbool.h>
-#include "image/bitmap.h"
-
-/*	Error return values
-*/
-#define GIF_INSUFFICIENT_FRAME_DATA -1
-#define GIF_FRAME_DATA_ERROR -2
-#define GIF_INSUFFICIENT_DATA -3
-#define GIF_DATA_ERROR -4
-#define GIF_INSUFFICIENT_MEMORY -5
-
-/*	Maximum colour table size
-*/
-#define GIF_MAX_COLOURS 256
-
-/*	Maximum LZW bits available
-*/
-#define GIF_MAX_LZW 12
-
-/*	The GIF frame data
-*/
-typedef struct gif_frame {
-  	unsigned int frame_pointer;		/**< offset (in bytes) to the GIF frame data */
-  	unsigned int frame_delay;		/**< delay (in cs) before animating the frame */
-  	bool virgin;				/**< whether the frame has previously been used */
-	bool opaque;				/**< whether the frame is totally opaque */
-	bool redraw_required;			/**< whether a forcable screen redraw is required */
-	unsigned int redraw_x;			/**< x co-ordinate of redraw rectangle */
-	unsigned int redraw_y;			/**< y co-ordinate of redraw rectangle */
-	unsigned int redraw_width;		/**< width of redraw rectangle */
-	unsigned int redraw_height;		/**< height of redraw rectangle */
-} gif_frame;
-
-/*	The GIF animation data
-*/
-typedef struct gif_animation {
-	unsigned char *gif_data;		/**< pointer to GIF data */
-	unsigned int buffer_position;		/**< current index into GIF data */
-	unsigned int buffer_size;		/**< total number of bytes of GIF data available */
-	unsigned int frame_holders;		/**< current number of frame holders */
-	int decoded_frame;			/**< current frame decoded to bitmap */
-	int loop_count;				/**< number of times to loop animation */
-	gif_frame *frames;			/**< decoded frames */
-	unsigned int width;			/**< width of GIF (may increase during decoding) */
-	unsigned int height;			/**< heigth of GIF (may increase during decoding) */
-	unsigned int frame_count;		/**< number of frames decoded */
-	unsigned int frame_count_partial;	/**< number of frames partially decoded */
-	unsigned int background_colour;		/**< image background colour */
-	unsigned int aspect_ratio;		/**< image aspect ratio (ignored) */
-	unsigned int colour_table_size;		/**< size of colour table (in entries) */
-	bool global_colours;			/**< whether the GIF has a global colour table */
-	unsigned int *global_colour_table;	/**< global colour table */
-	unsigned int *local_colour_table;	/**< local colour table */
-	int dirty_frame;			/**< the current dirty frame, or -1 for none */
-	struct bitmap *frame_image;		/**< currently decoded image */
-	int current_error;			/**< current error type, or 0 for none*/
-} gif_animation;
-
-int gif_initialise(struct gif_animation *gif);
-int gif_decode_frame(struct gif_animation *gif, unsigned int frame);
-void gif_finalise(struct gif_animation *gif);
-
-#endif