Merge in BMP support, sync up LSB functions.

src/bmp.h

@@ -0,0 +1,114 @@
+/* $Id$ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+	gd_bmp.c
+
+	Bitmap format support for libgd
+
+	* Written 2007, Scott MacVicar
+	---------------------------------------------------------------------------
+
+	Todo:
+
+	RLE4, RLE8 and Bitfield encoding
+	Add full support for Windows v4 and Windows v5 header formats
+
+	----------------------------------------------------------------------------
+ */
+
+#ifndef BMP_H
+#define BMP_H	1
+
+#define BMP_PALETTE_3 1
+#define BMP_PALETTE_4 2
+
+#define BMP_WINDOWS_V3 40
+#define BMP_OS2_V1 12
+#define BMP_OS2_V2 64
+#define BMP_WINDOWS_V4 108
+#define BMP_WINDOWS_V5 124
+
+#define BMP_BI_RGB 0
+#define BMP_BI_RLE8 1
+#define BMP_BI_RLE4 2
+#define BMP_BI_BITFIELDS 3
+#define BMP_BI_JPEG 4
+#define BMP_BI_PNG 5
+
+#define BMP_RLE_COMMAND 0
+#define BMP_RLE_ENDOFLINE 0
+#define BMP_RLE_ENDOFBITMAP 1
+#define BMP_RLE_DELTA 2
+
+#define BMP_RLE_TYPE_RAW 0
+#define BMP_RLE_TYPE_RLE 1
+
+/* BMP header. */
+typedef struct
+{
+	/* 16 bit - header identifying the type */
+	signed short int magic;
+
+	/* 32bit - size of the file */
+	int size;
+
+	/* 16bit - these two are in the spec but "reserved" */
+	signed short int reserved1;
+	signed short int reserved2;
+
+	/* 32 bit - offset of the bitmap header from data in bytes */
+	signed int off;
+
+} bmp_hdr_t;
+
+/* BMP info. */
+typedef struct
+{
+	/* 16bit - Type, ie Windows or OS/2 for the palette info */
+	signed short int type;
+	/* 32bit - The length of the bitmap information header in bytes. */
+	signed int len;
+
+	/* 32bit - The width of the bitmap in pixels. */
+	signed int width;
+
+	/* 32bit - The height of the bitmap in pixels. */
+	signed int height;
+
+	/* 8 bit - The bitmap data is specified in top-down order. */
+	signed char topdown;
+
+	/* 16 bit - The number of planes.  This must be set to a value of one. */
+	signed short int numplanes;
+
+	/* 16 bit - The number of bits per pixel. */
+	signed short int depth;
+
+	/* 32bit - The type of compression used. */
+	signed int enctype;
+
+	/* 32bit - The size of the image in bytes. */
+	signed int size;
+
+	/* 32bit - The horizontal resolution in pixels/metre. */
+	signed int hres;
+
+	/* 32bit - The vertical resolution in pixels/metre. */
+	signed int vres;
+
+	/* 32bit - The number of color indices used by the bitmap. */
+	signed int numcolors;
+
+	/* 32bit - The number of color indices important for displaying the bitmap. */
+	signed int mincolors;
+
+} bmp_info_t;
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif

src/gd.h

@@ -305,6 +305,10 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromTga( FILE * fp );
 BGD_DECLARE(gdImagePtr) gdImageCreateFromTgaCtx(gdIOCtx* ctx);
 BGD_DECLARE(gdImagePtr) gdImageCreateFromTgaPtr(int size, void *data);
 
+BGD_DECLARE(gdImagePtr) gdImageCreateFromBmp (FILE * inFile);
+BGD_DECLARE(gdImagePtr) gdImageCreateFromBmpPtr (int size, void *data);
+BGD_DECLARE(gdImagePtr) gdImageCreateFromBmpCtx (gdIOCtxPtr infile);
+
 /* A custom data source. */
 /* The source function must return -1 on error, otherwise the number
         of bytes fetched. 0 is EOF, not an error! */
@@ -589,6 +593,10 @@ BGD_DECLARE(void) gdImageTiff(gdImagePtr im, FILE *outFile);
 BGD_DECLARE(void *) gdImageTiffPtr(gdImagePtr im, int *size);
 BGD_DECLARE(void) gdImageTiffCtx(gdImagePtr image, gdIOCtx *out);
 
+BGD_DECLARE(void *) gdImageBmpPtr(gdImagePtr im, int *size, int compression);
+BGD_DECLARE(void) gdImageBmp(gdImagePtr im, FILE *outFile, int compression);
+BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression);
+
 /* 2.0.12: Compression level: 0-9 or -1, where 0 is NO COMPRESSION at all,
   1 is FASTEST but produces larger files, 9 provides the best
   compression (smallest files) but takes a long time to compress, and

src/gd_io.c

@@ -109,19 +109,18 @@ int gdGetWord(int *result, gdIOCtx *ctx)
 
 int gdGetWordLSB(signed short int *result, gdIOCtx *ctx)
 {
-	int high = 0, low = 0;
-
-	low = (ctx->getC)(ctx);
-	if(low == EOF) {
-		return 0;
+	unsigned int high = 0, low = 0;
+	low = (ctx->getC) (ctx);
+	if (low == EOF) {
+ 		return 0;
 	}
 
-	high = (ctx->getC)(ctx);
-	if(high == EOF) {
-		return 0;
+	high = (ctx->getC) (ctx);
+	if (high == EOF) {
+ 		return 0;
 	}
 
-	if(result) {
+	if (result) {
 		*result = (high << 8) | low;
 	}
 
@@ -165,41 +164,38 @@ int gdGetInt(int *result, gdIOCtx *ctx)
 
 int gdGetIntLSB(signed int *result, gdIOCtx *ctx)
 {
-	int c = 0, r = 0;
+	int c = 0;
+	unsigned int r = 0;
 
-	c = (ctx->getC)(ctx);
-	if(c == EOF) {
-		return 0;
+	c = (ctx->getC) (ctx);
+	if (c == EOF) {
+ 		return 0;
 	}
-
 	r |= (c << 24);
 	r >>= 8;
 
-	c = (ctx->getC)(ctx);
-	if(c == EOF) {
-		return 0;
+	c = (ctx->getC) (ctx);
+	if (c == EOF) {
+ 		return 0;
 	}
-
 	r |= (c << 24);
 	r >>= 8;
 
-	c = (ctx->getC)(ctx);
-	if(c == EOF) {
-		return 0;
+	c = (ctx->getC) (ctx);
+	if (c == EOF) {
+ 		return 0;
 	}
-
 	r |= (c << 24);
 	r >>= 8;
 
-	c = (ctx->getC)(ctx);
-	if(c == EOF) {
-		return 0;
+	c = (ctx->getC) (ctx);
+	if (c == EOF) {
+ 		return 0;
 	}
-
 	r |= (c << 24);
 
-	if(result) {
-		*result = r;
+	if (result) {
+		*result = (signed int)r;
 	}
 
 	return 1;