--- ray/src/common/tmapcolrs.c	1998/10/27 09:16:53	3.7
+++ ray/src/common/tmapcolrs.c	1998/10/28 09:26:03	3.9
@@ -93,20 +93,22 @@ int	len;
 		ls[i] = bi;
 		if (cs == TM_NOCHROM)			/* no color? */
 			continue;
-		if (tmTop->flags & TM_F_BW)
-			cmon[RED] = cmon[GRN] = cmon[BLU] = li;
 							/* mesopic adj. */
 		if (tmTop->flags & TM_F_MESOPIC && bi < BMESUPPER) {
 			register int	pf, sli = normscot(cmon);
 			if (bi < BMESLOWER)
 				cmon[RED] = cmon[GRN] = cmon[BLU] = sli;
 			else {
+				if (tmTop->flags & TM_F_BW)
+					cmon[RED] = cmon[GRN] = cmon[BLU] = li;
 				pf = photofact[bi-BMESLOWER];
 				sli *= 256 - pf;
 				cmon[RED] = ( sli + pf*cmon[RED] ) >> 8;
 				cmon[GRN] = ( sli + pf*cmon[GRN] ) >> 8;
 				cmon[BLU] = ( sli + pf*cmon[BLU] ) >> 8;
 			}
+		} else if (tmTop->flags & TM_F_BW) {
+			cmon[RED] = cmon[GRN] = cmon[BLU] = li;
 		}
 		bi = ( (int4)GAMTSZ*cd->clfb[RED]*cmon[RED]/li ) >> 8;
 		cs[3*i  ] = bi>=GAMTSZ ? 255 : cd->gamb[bi];
@@ -240,6 +242,7 @@ done:						/* clean up */
 }
 
 
+#ifdef PCOND
 int					/* run pcond to map picture */
 dopcond(psp, xp, yp, flags, monpri, gamval, Lddyn, Ldmax, fname)
 BYTE	**psp;
@@ -260,26 +263,26 @@ char	*fname;
 	if (setcolrcor(pow, 1./gamval) < 0)
 		returnErr(TM_E_NOMEM);
 					/* create command */
-	strcpy(cmdbuf, "pcond ");
+	strcpy(cmdbuf, PCOND);
 	if (flags & TM_F_HCONTR)
-		strcat(cmdbuf, "-s ");
+		strcat(cmdbuf, " -s");
 	if (flags & TM_F_MESOPIC)
-		strcat(cmdbuf, "-c ");
+		strcat(cmdbuf, " -c");
 	if (flags & TM_F_LINEAR)
-		strcat(cmdbuf, "-l ");
+		strcat(cmdbuf, " -l");
 	if (flags & TM_F_ACUITY)
-		strcat(cmdbuf, "-a ");
+		strcat(cmdbuf, " -a");
 	if (flags & TM_F_VEIL)
-		strcat(cmdbuf, "-v ");
+		strcat(cmdbuf, " -v");
 	if (flags & TM_F_CWEIGHT)
-		strcat(cmdbuf, "-w ");
-	sprintf(cmdbuf+strlen(cmdbuf),
-			"-p %f %f %f %f %f %f %f %f -d %f -u %f %s",
-			monpri[RED][CIEX], monpri[RED][CIEY],
-			monpri[GRN][CIEX], monpri[GRN][CIEY],
-			monpri[BLU][CIEX], monpri[BLU][CIEY],
-			monpri[WHT][CIEX], monpri[WHT][CIEY],
-			Lddyn, Ldmax, fname);
+		strcat(cmdbuf, " -w");
+	if (monpri != stdprims)
+		sprintf(cmdbuf+strlen(cmdbuf), " -p %f %f %f %f %f %f %f %f",
+				monpri[RED][CIEX], monpri[RED][CIEY],
+				monpri[GRN][CIEX], monpri[GRN][CIEY],
+				monpri[BLU][CIEX], monpri[BLU][CIEY],
+				monpri[WHT][CIEX], monpri[WHT][CIEY]);
+	sprintf(cmdbuf+strlen(cmdbuf), " -d %f -u %f %s", Lddyn, Ldmax, fname);
 					/* start pcond */
 	if ((infp = popen(cmdbuf, "r")) == NULL)
 		returnErr(TM_E_BADFILE);
@@ -323,6 +326,7 @@ char	*fname;
 	pclose(infp);
 	returnOK;
 }
+#endif
 
 
 int					/* map a Radiance picture */
@@ -348,10 +352,12 @@ FILE	*fp;
 	if (Lddyn < MINLDDYN) Lddyn = DEFLDDYN;
 	if (Ldmax < MINLDMAX) Ldmax = DEFLDMAX;
 	if (flags & TM_F_BW) monpri = stdprims;
+#ifdef PCOND
 						/* check for pcond run */
 	if (fp == TM_GETFILE && flags & TM_F_UNIMPL)
 		return( dopcond(psp, xp, yp, flags,
 				monpri, gamval, Lddyn, Ldmax, fname) );
+#endif
 						/* initialize tone mapping */
 	if (tmInit(flags, monpri, gamval) == NULL)
 		returnErr(TM_E_NOMEM);