--- ray/src/common/tonemap.c	2003/02/25 02:47:22	3.10
+++ ray/src/common/tonemap.c	2003/07/15 00:30:09	3.12
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: tonemap.c,v 3.10 2003/02/25 02:47:22 greg Exp $";
+static const char	RCSid[] = "$Id: tonemap.c,v 3.12 2003/07/15 00:30:09 greg Exp $";
 #endif
 /*
  * Tone mapping functions.
@@ -162,7 +162,7 @@ COLOR	*scan;
 int	len;
 {
 	static char	funcName[] = "tmCvColors";
-	static COLOR	csmall = {1e-6, 1e-6, 1e-6};
+	static COLOR	csmall = {.5*MINLUM, .5*MINLUM, .5*MINLUM};
 	COLOR	cmon;
 	double	lum, slum;
 	register double	d;
@@ -390,7 +390,7 @@ double	Ldmax;
 	float	*cumf;
 	int	brt0, histlen, threshold, ceiling, trimmings;
 	double	logLddyn, Ldmin, Ldavg, Lwavg, Tr, Lw, Ld;
-	int4	histot;
+	int32	histot;
 	double	sum;
 	register double	d;
 	register int	i, j;
@@ -492,7 +492,7 @@ register BYTE	*cs;
 int	len;
 {
 	static char	funcName[] = "tmMapPixels";
-	register int4	li, pv;
+	register int32	li, pv;
 
 	if (tmTop == NULL || tmTop->lumap == NULL)
 		returnErr(TM_E_TMINVAL);