--- ray/src/common/bmpfile.c	2004/09/14 02:53:50	2.12
+++ ray/src/common/bmpfile.c	2005/05/10 01:08:43	2.15
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: bmpfile.c,v 2.12 2004/09/14 02:53:50 greg Exp $";
+static const char RCSid[] = "$Id: bmpfile.c,v 2.15 2005/05/10 01:08:43 greg Exp $";
 #endif
 /*
  *  Windows and OS/2 BMP file support
@@ -71,12 +71,15 @@ BMPheaderOK(const BMPHeader *hdr)
 	if (hdr->compr == BI_BITFIELDS && (BMPbitField(hdr)[0] &
 				BMPbitField(hdr)[1] & BMPbitField(hdr)[2]))
 		return 0;
-	if ((hdr->nColors < 0) | (hdr->impColors < 0))
-		return 0;
-	if (hdr->impColors > hdr->nColors)
-		return 0;
-	if (hdr->nColors > BMPpalLen(hdr))
-		return 0;
+	if (hdr->bpp > 8) {
+		if (hdr->nColors != 0)
+			return 0;
+	} else {
+		if ((hdr->nColors < 0) | (hdr->nColors > 1<<hdr->bpp))
+			return 0;
+		if ((hdr->impColors < 0) | (hdr->impColors > hdr->nColors))
+			return 0;
+	}
 	return 1;
 }
 
@@ -143,9 +146,8 @@ BMPReader *
 BMPopenReader(int (*cget)(void *), int (*seek)(uint32, void *), void *c_data)
 {
 	BMPReader       *br;
-	uint32		bmPos, hdrSiz;
-	int		palLen;
-	int     magic[2];		/* check magic number */
+	uint32		bmPos, hdrSiz, palSiz;
+	int		magic[2];		/* check magic number */
 
 	if (cget == NULL)
 		return NULL;
@@ -186,27 +188,24 @@ BMPopenReader(int (*cget)(void *), int (*seek)(uint32,
 	br->hdr->hRes = rdint32(br);		/* horizontal resolution */
 	br->hdr->vRes = rdint32(br);		/* vertical resolution */
 	br->hdr->nColors = rdint32(br);		/* # colors used */
+	if (!br->hdr->nColors && br->hdr->bpp <= 8)
+		br->hdr->nColors = 1<<br->hdr->bpp;
 	br->hdr->impColors = rdint32(br);       /* # important colors */
 	if (br->hdr->impColors < 0)
 		goto err;			/* catch premature EOF */
 	if (!BMPheaderOK(br->hdr))
 		goto err;
-	palLen = BMPpalLen(br->hdr);
-	if (br->hdr->bpp <= 8) {		/* normalize color counts */
-		if (br->hdr->nColors <= 0)
-			br->hdr->nColors = palLen;
-		if (br->hdr->impColors <= 0)
-			br->hdr->impColors = br->hdr->nColors;
-	}
+	palSiz = sizeof(RGBquad)*br->hdr->nColors;
+	if (br->hdr->impColors <= 0)
+		br->hdr->impColors = br->hdr->nColors;
 						/* extend header */
-	if (bmPos < hdrSiz + sizeof(RGBquad)*palLen)
+	if (bmPos < hdrSiz + palSiz)
 		goto err;
-	br->hdr->infoSiz = bmPos - (hdrSiz + sizeof(RGBquad)*palLen);
-	if (palLen > 0 || br->hdr->infoSiz > 0) {
+	br->hdr->infoSiz = bmPos - (hdrSiz + palSiz);
+	if (br->hdr->nColors > 0 || br->hdr->infoSiz > 0) {
 		br->hdr = (BMPHeader *)realloc((void *)br->hdr,
 					sizeof(BMPHeader) +
-					sizeof(RGBquad)*palLen +
-					br->hdr->infoSiz);
+					palSiz + br->hdr->infoSiz);
 		if (br->hdr == NULL)
 			goto err;
 	}
@@ -215,8 +214,7 @@ BMPopenReader(int (*cget)(void *), int (*seek)(uint32,
 		BMPbitField(br->hdr)[0] = (uint32)rdint32(br);
 		BMPbitField(br->hdr)[1] = (uint32)rdint32(br);
 		BMPbitField(br->hdr)[2] = (uint32)rdint32(br);
-	} else if (rdbytes((char *)br->hdr->palette,
-			sizeof(RGBquad)*palLen, br) != BIR_OK)
+	} else if (rdbytes((char *)br->hdr->palette, palSiz, br) != BIR_OK)
 		goto err;
 						/* read add'l information */
 	if (rdbytes(BMPinfo(br->hdr), br->hdr->infoSiz, br) != BIR_OK)
@@ -261,8 +259,8 @@ BMPisGrayscale(const BMPHeader *hdr)
 		return -1;
 	if (hdr->bpp > 8)		/* assume they had a reason for it */
 		return 0;
-	for (rgbp = hdr->palette, n = hdr->nColors; n-- > 0; rgbp++)
-		if (((rgbp->r != rgbp->g) | (rgbp->g != rgbp->b)))
+	for (rgbp = hdr->palette, n = hdr->impColors; n-- > 0; rgbp++)
+		if ((rgbp->r != rgbp->g) | (rgbp->g != rgbp->b))
 			return 0;
 	return 1;			/* all colors neutral in map */
 }
@@ -302,7 +300,7 @@ BMPreadScanline(BMPReader *br)
 	 * is it specified what we should assume for missing pixels.  This
 	 * is undoubtedly the most brain-dead format I've ever encountered.
 	 */
-	sp = br->scanline;
+	sp = (int8 *)br->scanline;
 	n = br->hdr->width;
 	if (br->hdr->compr == BI_RLE4)
 		n = (n + 1) >> 1;
@@ -642,7 +640,7 @@ BMPopenWriter(void (*cput)(int, void *), int (*seek)(u
 	hdrSiz = 2 + 6*4 + 2*2 + 6*4;
 	if (hdr->compr == BI_BITFIELDS)
 		hdrSiz += sizeof(uint32)*3;
-	palSiz = sizeof(RGBquad)*BMPpalLen(hdr);
+	palSiz = sizeof(RGBquad)*hdr->nColors;
 	scanSiz = getScanSiz(hdr);
 	bmSiz = hdr->height*scanSiz;		/* wrong if compressed */
 						/* initialize writer */
@@ -738,7 +736,7 @@ BMPwriteScanline(BMPWriter *bw)
 	 * (0x0000) except for the last, which ends in a bitmap break
 	 * (0x0001).  We don't support RLE4 at all; it's too awkward.
 	 */
-	sp = bw->scanline;
+	sp = (const int8 *)bw->scanline;
 	n = bw->hdr->width;
 	while (n > 0) {
 		int     cnt, val;