--- ray/src/px/ra_tiff.c	1997/08/26 15:01:26	2.12
+++ ray/src/px/ra_tiff.c	1997/09/24 14:54:03	2.15
@@ -278,6 +278,7 @@ initfromtif()		/* initialize conversion from TIFF inpu
 		break;
 	case PHOTOMETRIC_MINISBLACK:
 		SET(C_GRY|C_GAMMA|C_GAMUT);
+		setcolrgam(cvts.gamcor);
 		cvts.pconf = PLANARCONFIG_CONTIG;
 		if (!TIFFGetField(cvts.tif, TIFFTAG_SAMPLESPERPIXEL, &hi) ||
 				hi != 1)
@@ -579,10 +580,10 @@ uint32	y;
 		if (TIFFReadScanline(cvts.tif, cvts.t.p, y, 0) < 0)
 			goto readerr;
 		if (TIFFReadScanline(cvts.tif,
-				(tidata_t)(cvts.t.bp + cvts.xmax), y, 1) < 0)
+				(tdata_t)(cvts.t.bp + cvts.xmax), y, 1) < 0)
 			goto readerr;
 		if (TIFFReadScanline(cvts.tif,
-				(tidata_t)(cvts.t.bp + 2*cvts.xmax), y, 2) < 0)
+				(tdata_t)(cvts.t.bp + 2*cvts.xmax), y, 2) < 0)
 			goto readerr;
 		for (x = cvts.xmax; x--; ) {
 			cvts.r.colrs[x][RED] = cvts.t.bp[x];
@@ -646,7 +647,7 @@ uint32	y;
 	double	m = pow(2.,(double)cvts.bradj);
 	register int	x;
 
-	if (CHK(C_RFLT|C_TFLT) != (C_RFLT|C_TFLT) | !CHK(C_GRY))
+	if (CHK(C_RFLT|C_TFLT|C_GRY) != (C_RFLT|C_TFLT|C_GRY))
 		quiterr("internal error 1 in Color2L");
 
 	if (freadscan(cvts.r.colors, cvts.xmax, cvts.rfp) < 0)