cvs: gd /playground/gdbmp gd_bmp.c

http://cvs.php.net/viewvc.cgi/gd/playground/gdbmp/gd_bmp.c?r1=1.3&r2=1.4&diff_format=u
Index: gd/playground/gdbmp/gd_bmp.c
diff -u gd/playground/gdbmp/gd_bmp.c:1.3 gd/playground/gdbmp/gd_bmp.c:1.4
--- gd/playground/gdbmp/gd_bmp.c:1.3	Thu Jan  3 02:15:19 2008
+++ gd/playground/gdbmp/gd_bmp.c	Thu Jan  3 02:37:45 2008
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include "gd.h"
+#include "gdhelpers.h"
 #include "bmp.h"
 
 static int bmp_read_header(gdIOCtxPtr infile, bmp_hdr_t *hdr);
@@ -44,21 +45,21 @@
 
 #define BMP_DEBUG(s)
 
-BGD_DECLARE(gdImagePtr) gdImageCreateFromBmp (FILE * inFile)
+BGD_DECLARE(gdImagePtr) gdImageCreateFromBmp(FILE * inFile)
 {
 	gdImagePtr im = 0;
-	gdIOCtx *in = gdNewFileCtx (inFile);
-	im = gdImageCreateFromBmpCtx (in);
-	in->gd_free (in);
+	gdIOCtx *in = gdNewFileCtx(inFile);
+	im = gdImageCreateFromBmpCtx(in);
+	in->gd_free(in);
 	return im;
 }
 
-BGD_DECLARE(gdImagePtr) gdImageCreateFromBmpPtr (int size, void *data)
+BGD_DECLARE(gdImagePtr) gdImageCreateFromBmpPtr(int size, void *data)
 {
 	gdImagePtr im;
-	gdIOCtx *in = gdNewDynamicCtxEx (size, data, 0);
-	im = gdImageCreateFromBmpCtx (in);
-	in->gd_free (in);
+	gdIOCtx *in = gdNewDynamicCtxEx(size, data, 0);
+	im = gdImageCreateFromBmpCtx(in);
+	in->gd_free(in);
 	return im;
 }
 
@@ -66,32 +67,27 @@
 {
 	bmp_hdr_t *hdr;
 	bmp_info_t *info;
-	unsigned char buf[14];
 	gdImagePtr im = NULL;
 	int error = 0;
 
-	if (!(hdr= (bmp_hdr_t *)gdMalloc(sizeof(bmp_hdr_t))))
-	{
+	if (!(hdr= (bmp_hdr_t *)gdMalloc(sizeof(bmp_hdr_t)))) {
 		return NULL;
 	}
 	memset(hdr, 0, sizeof(*hdr));
-	if (bmp_read_header(infile, hdr))
-	{
+	if (bmp_read_header(infile, hdr)) {
 		return NULL;
 	}
 
-	if (hdr->magic != 0x4d42)
-	{
+	if (hdr->magic != 0x4d42) {
 		return NULL;
 	}
 
-	if (!(info = (bmp_info_t *)gdMalloc(sizeof(bmp_info_t))))
-	{
+	if (!(info = (bmp_info_t *)gdMalloc(sizeof(bmp_info_t)))) {
 		return NULL;
 	}
+
 	memset(info, 0, sizeof(*info));
-	if (bmp_read_info(infile, info))
-	{
+	if (bmp_read_info(infile, info)) {
 		gdFree(hdr);
 		gdFree(info);
 		return NULL;
@@ -103,24 +99,20 @@
 	BMP_DEBUG(printf("Planes: %d\n", info->numplanes));
 	BMP_DEBUG(printf("Depth: %d\n", info->depth));
 	BMP_DEBUG(printf("Offset: %d\n", hdr->off));
-	if (info->depth >= 16)
-	{
+
+	if (info->depth >= 16) {
 		im = gdImageCreateTrueColor(info->width, info->height);
-	}
-	else
-	{
+	} else {
 		im = gdImageCreate(info->width, info->height);
 	}
 
-	if (!im)
-	{
+	if (!im) {
 		gdFree(hdr);
 		gdFree(info);
 		return NULL;
 	}
 
-	switch (info->depth)
-	{
+	switch (info->depth) {
 		case 1:
 			BMP_DEBUG(printf("1-bit image\n"));
 			error = bmp_read_1bit(im, infile, info, hdr);
@@ -147,8 +139,7 @@
 	gdFree(hdr);
 	gdFree(info);
 
-	if (error)
-	{
+	if (error) {
 		gdImageDestroy(im);
 		return NULL;
 	}
@@ -164,8 +155,7 @@
 	!gdBMPGetWord(&hdr->reserved1, infile) ||
 	!gdBMPGetWord(&hdr->reserved2 , infile) ||
 	!gdBMPGetInt(&hdr->off , infile)
-	)
-	{
+	) {
 		return 1;
 	}
 	return 0;
@@ -174,32 +164,27 @@
 static int bmp_read_info(gdIOCtx *infile, bmp_info_t *info)
 {
 	/* read BMP length so we can work out the version */
-	if (!gdBMPGetInt(&info->len, infile))
-	{
+	if (!gdBMPGetInt(&info->len, infile)) {
 		return 1;
 	}
 
-	switch (info->len)
-	{
+	switch (info->len) {
 		/* For now treat Windows v4 + v5 as v3 */
 		case BMP_WINDOWS_V3:
 		case BMP_WINDOWS_V4:
 		case BMP_WINDOWS_V5:
 			BMP_DEBUG(printf("Reading Windows Header\n"));
-			if (bmp_read_windows_v3_info(infile, info))
-			{
+			if (bmp_read_windows_v3_info(infile, info)) {
 				return 1;
 			}
 		break;
 		case BMP_OS2_V1:
-			if (bmp_read_os2_v1_info(infile, info))
-			{
+			if (bmp_read_os2_v1_info(infile, info)) {
 				return 1;
 			}
 		break;
 		case BMP_OS2_V2:
-			if (bmp_read_os2_v2_info(infile, info))
-			{
+			if (bmp_read_os2_v2_info(infile, info)) {
 				return 1;
 			}
 		break;
@@ -223,26 +208,21 @@
 		!gdBMPGetInt(&info->vres, infile) ||
 		!gdBMPGetInt(&info->numcolors, infile) ||
 		!gdBMPGetInt(&info->mincolors, infile)
-	)
-	{
+	) {
 		return 1;
 	}
 
-	if (info->height < 0)
-	{
+	if (info->height < 0) {
 		info->topdown = 1;
 		info->height = -info->height;
-	}
-	else
-	{
+	} else {
 		info->topdown = 0;
 	}
 
 	info->type = BMP_PALETTE_4;
 
 	if (info->width <= 0 || info->height <= 0 || info->numplanes <= 0 ||
-	  info->depth <= 0  || info->numcolors < 0 || info->mincolors < 0)
-	{
+	  info->depth <= 0  || info->numcolors < 0 || info->mincolors < 0) {
 		return 1;
 	}
 
@@ -256,8 +236,7 @@
 		!gdBMPGetWord(&info->height, infile) ||
 		!gdBMPGetWord(&info->numplanes, infile) ||
 		!gdBMPGetWord(&info->depth, infile)
-	)
-	{
+	) {
 		return 1;
 	}
 
@@ -268,8 +247,7 @@
 	info->type = BMP_PALETTE_3;
 
 	if (info->width <= 0 || info->height <= 0 || info->numplanes <= 0 ||
-	  info->depth <= 0 || info->numcolors < 0)
-	{
+	  info->depth <= 0 || info->numcolors < 0) {
 		return 1;
 	}
 
@@ -290,32 +268,26 @@
 		!gdBMPGetInt(&info->vres, infile) ||
 		!gdBMPGetInt(&info->numcolors, infile) ||
 		!gdBMPGetInt(&info->mincolors, infile)
-	)
-	{
+	) {
 		return 1;
 	}
 
 	/* Lets seek the next 24 pointless bytes, we don't care too much about it */
-	if (!gdGetBuf(useless_bytes, 24, infile))
-	{
+	if (!gdGetBuf(useless_bytes, 24, infile)) {
 		return 1;
 	}
 
-	if (info->height < 0)
-	{
+	if (info->height < 0) {
 		info->topdown = 1;
 		info->height = -info->height;
-	}
-	else
-	{
+	} else {
 		info->topdown = 0;
 	}
 
 	info->type = BMP_PALETTE_4;
 
 	if (info->width <= 0 || info->height <= 0 || info->numplanes <= 0 ||
-	 info->depth <= 0  || info->numcolors < 0 || info->mincolors < 0)
-	{
+	 info->depth <= 0  || info->numcolors < 0 || info->mincolors < 0) {
 		return 1;
 	}
 
@@ -328,15 +300,13 @@
 	int ypos = 0, xpos = 0, row = 0, data = 0;
 	int padding = 0, alpha = 0, red = 0, green = 0, blue = 0;
 
-	switch(info->enctype)
-	{
+	switch(info->enctype) {
 		case BMP_BI_RGB:
-
+			/* no-op */
 		break;
 
 		case BMP_BI_BITFIELDS:
-			if (info->depth == 24)
-			{
+			if (info->depth == 24) {
 				BMP_DEBUG(printf("Bitfield compression isn't supported for 24-bit\n"));
 				return 1;
 			}
@@ -345,14 +315,12 @@
 		break;
 
 		case BMP_BI_RLE8:
-			if (info->depth != 8)
-			{
+			if (info->depth != 8) {
 				BMP_DEBUG(printf("RLE is only valid for 8-bit images\n"));
 				return 1;
 			}
 		case BMP_BI_RLE4:
-			if (info->depth != 4)
-			{
+			if (info->depth != 4) {
 				BMP_DEBUG(printf("RLE is only valid for 4-bit images\n"));
 				return 1;
 			}
@@ -364,36 +332,28 @@
 	}
 
 	/* There is a chance the data isn't until later, would be wierd but it is possible */
-	if (gdTell(infile) != header->off)
-	{ /* Should make sure we don't seek past the file size */
+	if (gdTell(infile) != header->off) {
+		/* Should make sure we don't seek past the file size */
 		gdSeek(infile, header->off);
 	}
 
 	/* The line must be divisible by 4, else its padded with NULLs */
 	padding = ((int)(info->depth / 8) * info->width) % 4;
-	if (padding)
-	{
+	if (padding) {
 		padding = 4 - padding;
 	}
 
 
-	for (ypos = 0; ypos < info->height; ++ypos)
-	{
-		if (info->topdown)
-		{
+	for (ypos = 0; ypos < info->height; ++ypos) {
+		if (info->topdown) {
 			row = ypos;
-		}
-		else
-		{
+		} else {
 			row = info->height - ypos - 1;
 		}
 
-		for (xpos = 0; xpos < info->width; xpos++)
-		{
-			if (info->depth == 16)
-			{
-				if (!gdBMPGetWord(&data, infile))
-				{
+		for (xpos = 0; xpos < info->width; xpos++) {
+			if (info->depth == 16) {
+				if (!gdBMPGetWord(&data, infile)) {
 					return 1;
 				}
 				BMP_DEBUG(printf("Data: %X\n", data));
@@ -401,28 +361,20 @@
 				green = ((data & 0x3E0) >> 5) << 3;
 				blue = (data & 0x1F) << 3;
 				BMP_DEBUG(printf("R: %d, G: %d, B: %d\n", red, green, blue));
-			}
-			else if (info->depth == 24)
-			{
-				if (!gdGetByte(&blue, infile) || !gdGetByte(&green, infile) || !gdGetByte(&red, infile))
-				{
+			} else if (info->depth == 24) {
+				if (!gdGetByte(&blue, infile) || !gdGetByte(&green, infile) || !gdGetByte(&red, infile)) {
 					return 1;
 				}
-			}
-			else
-			{
-				if (!gdGetByte(&blue, infile) || !gdGetByte(&green, infile) || !gdGetByte(&red, infile) || !gdGetByte(&alpha, infile))
-				{
+			} else {
+				if (!gdGetByte(&blue, infile) || !gdGetByte(&green, infile) || !gdGetByte(&red, infile) || !gdGetByte(&alpha, infile)) {
 					return 1;
 				}
 			}
 			/*alpha = gdAlphaMax - (alpha >> 1);*/
 			gdImageSetPixel(im, xpos, row, gdTrueColor(red, green, blue));
 		}
-		for (xpos = padding; xpos > 0; --xpos)
-		{
-			if (!gdGetByte(&red, infile))
-			{
+		for (xpos = padding; xpos > 0; --xpos) {
+			if (!gdGetByte(&red, infile)) {
 				return 1;
 			}
 		}
@@ -436,15 +388,13 @@
 	int i;
 	int r, g, b, z;
 
-	for (i = 0; i < count; i++)
-	{
+	for (i = 0; i < count; i++) {
 		if (
 		!gdGetByte(&r, infile) ||
 		!gdGetByte(&g, infile) ||
 		!gdGetByte(&b, infile) ||
 		(read_four && !gdGetByte(&z, infile))
-		)
-		{
+		) {
 			return 1;
 		}
 		im->red[i] = r;
@@ -460,76 +410,62 @@
 	int ypos = 0, xpos = 0, row = 0, index = 0;
 	int padding = 0, current_byte = 0, bit = 0;
 
-	if (info->enctype != BMP_BI_RGB)
-	{
+	if (info->enctype != BMP_BI_RGB) {
 		return 1;
 	}
 
-	if (!info->numcolors)
-	{
+	if (!info->numcolors) {
 		info->numcolors = 2;
-	}
-	else if (info->numcolors < 0 || info->numcolors > 2)
-	{
+	} else if (info->numcolors < 0 || info->numcolors > 2) {
 		return 1;
 	}
 
-	if (bmp_read_palette(im, infile, info->numcolors, (info->type == BMP_PALETTE_4)))
-	{
+	if (bmp_read_palette(im, infile, info->numcolors, (info->type == BMP_PALETTE_4))) {
 		return 1;
 	}
 
 	im->colorsTotal = info->numcolors;
 
 	/* There is a chance the data isn't until later, would be wierd but it is possible */
-	if (gdTell(infile) != header->off)
-	{ /* Should make sure we don't seek past the file size */
+	if (gdTell(infile) != header->off) {
+		/* Should make sure we don't seek past the file size */
 		gdSeek(infile, header->off);
 	}
 
 	/* The line must be divisible by 4, else its padded with NULLs */
 	padding = ((int)ceill(0.1 * info->width)) % 4;
-	if (padding)
-	{
+	if (padding) {
 		padding = 4 - padding;
 	}
 
-	for (ypos = 0; ypos < info->height; ++ypos)
-	{
-		if (info->topdown)
-		{
+	for (ypos = 0; ypos < info->height; ++ypos) {
+		if (info->topdown) {
 			row = ypos;
-		}
-		else
-		{
+		} else {
 			row = info->height - ypos - 1;
 		}
-		for (xpos = 0; xpos < info->width; xpos+=8)
-		{
+
+		for (xpos = 0; xpos < info->width; xpos += 8) {
 			/* Bitmaps are always aligned in bytes so we'll never overflow */
-			if (!gdGetByte(&current_byte, infile))
-			{
+			if (!gdGetByte(&current_byte, infile)) {
 				return 1;
 			}
-			for (bit = 0; bit < 8; bit++)
-			{
+
+			for (bit = 0; bit < 8; bit++) {
 				index = ((current_byte & (0x80 >> bit)) != 0 ? 0x01 : 0x00);
-				if (im->open[index])
-				{
+				if (im->open[index]) {
 					im->open[index] = 0;
 				}
 				gdImageSetPixel(im, xpos + bit, row, index);
 				/* No need to read anything extra */
-				if ((xpos + bit) >= info->width)
-				{
+				if ((xpos + bit) >= info->width) {
 					break;
 				}
 			}
 		}
-		for (xpos = padding; xpos > 0; --xpos)
-		{
-			if (!gdGetByte(&index, infile))
-			{
+
+		for (xpos = padding; xpos > 0; --xpos) {
+			if (!gdGetByte(&index, infile)) {
 				return 1;
 			}
 		}
@@ -542,82 +478,68 @@
 	int ypos = 0, xpos = 0, row = 0, index = 0;
 	int padding = 0, current_byte = 0;
 
-	if (info->enctype != BMP_BI_RGB && info->enctype != BMP_BI_RLE4)
-	{
+	if (info->enctype != BMP_BI_RGB && info->enctype != BMP_BI_RLE4) {
 		return 1;
 	}
 
-	if (!info->numcolors)
-	{
+	if (!info->numcolors) {
 		info->numcolors = 16;
-	}
-	else if (info->numcolors < 0 || info->numcolors > 16)
-	{
+	} else if (info->numcolors < 0 || info->numcolors > 16) {
 		return 1;
 	}
 
-	if (bmp_read_palette(im, infile, info->numcolors, (info->type == BMP_PALETTE_4)))
-	{
+	if (bmp_read_palette(im, infile, info->numcolors, (info->type == BMP_PALETTE_4))) {
 		return 1;
 	}
 
 	im->colorsTotal = info->numcolors;
 
 	/* There is a chance the data isn't until later, would be wierd but it is possible */
-	if (gdTell(infile) != header->off)
-	{ /* Should make sure we don't seek past the file size */
+	if (gdTell(infile) != header->off) {
+		/* Should make sure we don't seek past the file size */
 		gdSeek(infile, header->off);
 	}
 
 	/* The line must be divisible by 4, else its padded with NULLs */
 	padding = ((int)ceil(0.5 * info->width)) % 4;
-	if (padding)
-	{
+	if (padding) {
 		padding = 4 - padding;
 	}
 
-	switch (info->enctype)
-	{
+	switch (info->enctype) {
 		case BMP_BI_RGB:
-		for (ypos = 0; ypos < info->height; ++ypos)
-		{
-			if (info->topdown)
-			{
+		for (ypos = 0; ypos < info->height; ++ypos) {
+			if (info->topdown) {
 				row = ypos;
-			}
-			else
-			{
+			} else {
 				row = info->height - ypos - 1;
 			}
-			for (xpos = 0; xpos < info->width; xpos+=2)
-			{
-				if (!gdGetByte(&current_byte, infile))
-				{
+
+			for (xpos = 0; xpos < info->width; xpos += 2) {
+				if (!gdGetByte(&current_byte, infile)) {
 					return 1;
 				}
+
 				index = (current_byte >> 4) & 0x0f;
-				if (im->open[index])
-				{
+				if (im->open[index]) {
 					im->open[index] = 0;
 				}
 				gdImageSetPixel(im, xpos, row, index);
+
 				/* This condition may get called often, potential optimsations */
-				if (xpos >= info->width)
-				{
+				if (xpos >= info->width) {
 					break;
 				}
 	
 				index = current_byte & 0x0f;
-				if (im->open[index])
-				{
+				if (im->open[index]) {
 					im->open[index] = 0;
 				}
 				gdImageSetPixel(im, xpos + 1, row, index);
 			}
-			for (xpos = padding; xpos > 0; --xpos)
-			{
-				if (!gdGetByte(&index, infile))
-				{
+
+			for (xpos = padding; xpos > 0; --xpos) {
+				if (!gdGetByte(&index, infile)) {
 					return 1;
 				}
 			}
@@ -625,8 +547,7 @@
 		break;
 
 		case BMP_BI_RLE4:
-		if (bmp_read_rle(im, infile, info))
-		{
+		if (bmp_read_rle(im, infile, info)) {
 			return 1;
 		}
 		break;
@@ -642,72 +563,56 @@
 	int ypos = 0, xpos = 0, row = 0, index = 0;
 	int padding = 0;
 
-	if (info->enctype != BMP_BI_RGB && info->enctype != BMP_BI_RLE8)
-	{
+	if (info->enctype != BMP_BI_RGB && info->enctype != BMP_BI_RLE8) {
 		return 1;
 	}
 
-	if (!info->numcolors)
-	{
+	if (!info->numcolors) {
 		info->numcolors = 256;
-	}
-
-	else if (info->numcolors < 0 || info->numcolors > 256)
-	{
+	} else if (info->numcolors < 0 || info->numcolors > 256) {
 		return 1;
 	}
 
-	if (bmp_read_palette(im, infile, info->numcolors, (info->type == BMP_PALETTE_4)))
-	{
+	if (bmp_read_palette(im, infile, info->numcolors, (info->type == BMP_PALETTE_4))) {
 		return 1;
 	}
 
 	im->colorsTotal = info->numcolors;
 
 	/* There is a chance the data isn't until later, would be wierd but it is possible */
-	if (gdTell(infile) != header->off)
-	{ /* Should make sure we don't seek past the file size */
+	if (gdTell(infile) != header->off) {
+		/* Should make sure we don't seek past the file size */
 		gdSeek(infile, header->off);
 	}
 
 	/* The line must be divisible by 4, else its padded with NULLs */
 	padding = (1 * info->width) % 4;
-	if (padding)
-	{
+	if (padding) {
 		padding = 4 - padding;
 	}
 
-	switch (info->enctype)
-	{
+	switch (info->enctype) {
 		case BMP_BI_RGB:
-		for (ypos = 0; ypos < info->height; ++ypos)
-		{
-			if (info->topdown)
-			{
+		for (ypos = 0; ypos < info->height; ++ypos) {
+			if (info->topdown) {
 				row = ypos;
-			}
-			else
-			{
+			} else {
 				row = info->height - ypos - 1;
 			}
-			for (xpos = 0; xpos < info->width; ++xpos)
-			{
-				if (!gdGetByte(&index, infile))
-				{
+
+			for (xpos = 0; xpos < info->width; ++xpos) {
+				if (!gdGetByte(&index, infile)) {
 					return 1;
 				}
 
-				if (im->open[index])
-				{
+				if (im->open[index]) {
 					im->open[index] = 0;
 				}
 				gdImageSetPixel(im, xpos, row, index);
 			}
 			/* Could create a new variable, but it isn't really worth it */
-			for (xpos = padding; xpos > 0; --xpos)
-			{
-				if (!gdGetByte(&index, infile))
-				{
+			for (xpos = padding; xpos > 0; --xpos) {
+				if (!gdGetByte(&index, infile)) {
 					return 1;
 				}
 			}
@@ -715,8 +620,7 @@
 		break;
 
 		case BMP_BI_RLE8:
-		if (bmp_read_rle(im, infile, info))
-		{
+		if (bmp_read_rle(im, infile, info)) {
 			return 1;
 		}
 		break;
@@ -735,58 +639,44 @@
 	int i = 0, j = 0;
 	int pixels_per_byte = 8 / info->depth;
 
-	for (ypos = 0; ypos < info->height && xpos <= info->width;)
-	{
-		if (!gdGetByte(&rle_length, infile) || !gdGetByte(&rle_data, infile))
-		{
+	for (ypos = 0; ypos < info->height && xpos <= info->width;) {
+		if (!gdGetByte(&rle_length, infile) || !gdGetByte(&rle_data, infile)) {
 			return 1;
 		}
 		row = info->height - ypos - 1;
 
-		if (rle_length != BMP_RLE_COMMAND)
-		{
-			if (im->open[rle_data])
-			{
+		if (rle_length != BMP_RLE_COMMAND) {
+			if (im->open[rle_data]) {
 				im->open[rle_data] = 0;
 			}
 
-			for (i = 0; (i < rle_length) && (xpos < info->width);)
-			{
-				for (j = 1; (j <= pixels_per_byte) && (xpos < info->width) && (i < rle_length); j++, xpos++, i++)
-				{
+			for (i = 0; (i < rle_length) && (xpos < info->width);) {
+				for (j = 1; (j <= pixels_per_byte) && (xpos < info->width) && (i < rle_length); j++, xpos++, i++) {
 					index = (rle_data & (((1 << info->depth) - 1) << (8 - (j * info->depth)))) >> (8 - (j * info->depth));
-					if (im->open[index])
-					{
+					if (im->open[index]) {
 						im->open[index] = 0;
 					}
 					gdImageSetPixel(im, xpos, row, index);
 				}
 			}
-		}
-		else if (rle_length == BMP_RLE_COMMAND && rle_data > 2)
-		{
+		} else if (rle_length == BMP_RLE_COMMAND && rle_data > 2) {
 			/* Uncompressed RLE needs to be even */
 			padding = 0;
-			for (i = 0; (i < rle_data) && (xpos < info->width); i += pixels_per_byte)
-			{
+			for (i = 0; (i < rle_data) && (xpos < info->width); i += pixels_per_byte) {
 				int max_pixels = pixels_per_byte;
 
-				if (!gdGetByte(&index, infile))
-				{
+				if (!gdGetByte(&index, infile)) {
 					return 1;
 				}
 				padding++;
 
-				if (rle_data - i < max_pixels)
-				{
+				if (rle_data - i < max_pixels) {
 					max_pixels = rle_data - i;
 				}
 
-				for (j = 1; (j <= max_pixels)  && (xpos < info->width); j++, xpos++)
-				{
+				for (j = 1; (j <= max_pixels)  && (xpos < info->width); j++, xpos++) {
 					int temp = (index >> (8 - (j * info->depth))) & ((1 << info->depth) - 1);
-					if (im->open[temp])
-					{
+					if (im->open[temp]) {
 						im->open[temp] = 0;
 					}
 					gdImageSetPixel(im, xpos, row, temp);
@@ -794,29 +684,21 @@
 			}
 
 			/* Make sure the bytes read are even */
-			if (padding % 2 && !gdGetByte(&index, infile))
-			{
+			if (padding % 2 && !gdGetByte(&index, infile)) {
 				return 1;
 			}
-		}
-		else if (rle_length == BMP_RLE_COMMAND && rle_data == BMP_RLE_ENDOFLINE)
-		{
+		} else if (rle_length == BMP_RLE_COMMAND && rle_data == BMP_RLE_ENDOFLINE) {
 			/* Next Line */
 			xpos = 0;
 			ypos++;
-		}
-		else if (rle_length == BMP_RLE_COMMAND && rle_data == BMP_RLE_DELTA)
-		{
+		} else if (rle_length == BMP_RLE_COMMAND && rle_data == BMP_RLE_DELTA) {
 			/* Delta Record, used for bmp files that contain other data*/
-			if (!gdGetByte(&rle_length, infile) || !gdGetByte(&rle_data, infile))
-			{
+			if (!gdGetByte(&rle_length, infile) || !gdGetByte(&rle_data, infile)) {
 				return 1;
 			}
 			xpos += rle_length;
 			ypos += rle_data;
-		}
-		else if (rle_length == BMP_RLE_COMMAND && rle_data == BMP_RLE_ENDOFBITMAP)
-		{
+		} else if (rle_length == BMP_RLE_COMMAND && rle_data == BMP_RLE_ENDOFBITMAP) {
 			/* End of bitmap */
 			break;
 		}
@@ -828,19 +710,16 @@
 {
 	int high = 0, low = 0;
 	low = (ctx->getC) (ctx);
-	if (low == EOF)
- 	{
+	if (low == EOF) {
  		return 0;
 	}
 
 	high = (ctx->getC) (ctx);
-	if (high == EOF)
- 	{
+	if (high == EOF) {
  		return 0;
 	}
 
-	if (result)
-	{
+	if (result) {
 		*result = (high << 8) | low;
 	}
 
@@ -851,38 +730,33 @@
 {
 	int c = 0, r = 0;
 	c = (ctx->getC) (ctx);
-	if (c == EOF)
- 	{
+	if (c == EOF) {
  		return 0;
 	}
 	r |= (c << 24);
 	r >>= 8;
 
 	c = (ctx->getC) (ctx);
-	if (c == EOF)
- 	{
+	if (c == EOF) {
  		return 0;
 	}
 	r |= (c << 24);
 	r >>= 8;
 
 	c = (ctx->getC) (ctx);
-	if (c == EOF)
- 	{
+	if (c == EOF) {
  		return 0;
 	}
 	r |= (c << 24);
 	r >>= 8;
 
 	c = (ctx->getC) (ctx);
-	if (c == EOF)
- 	{
+	if (c == EOF) {
  		return 0;
 	}
 	r |= (c << 24);
 
-	if (result)
-	{
+	if (result) {
 		*result = r;
 	}