--- ray/src/util/radcompare.c	2018/10/15 22:21:45	2.5
+++ ray/src/util/radcompare.c	2018/10/16 16:23:17	2.8
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: radcompare.c,v 2.5 2018/10/15 22:21:45 greg Exp $";
+static const char RCSid[] = "$Id: radcompare.c,v 2.8 2018/10/16 16:23:17 greg Exp $";
 #endif
 /*
  * Compare Radiance files for significant differences
@@ -33,6 +33,11 @@ double	max_lim = 0.25;		/* difference limit if non-neg
 
 int	lin1cnt=0, lin2cnt=0;	/* file line position */
 
+const char	nsuffix[10][3] = {		/* 1st, 2nd, 3rd, etc. */
+			"th","st","nd","rd","th","th","th","th","th","th"
+		};
+#define	num_sfx(n)	nsuffix[(n)%10]
+
 				/* file types */
 const char	*file_type[] = {
 			"Unrecognized",
@@ -48,7 +53,7 @@ const char	*file_type[] = {
 			"BINARY_unknown",
 			NULL	/* terminator */
 		};
-
+				/* keep consistent with above */
 enum {TYP_UNKNOWN, TYP_TEXT, TYP_ASCII, TYP_RGBE, TYP_XYZE, TYP_FLOAT,
 		TYP_DOUBLE, TYP_RBFMESH, TYP_OCTREE, TYP_TMESH, TYP_BINARY};
 		
@@ -77,7 +82,7 @@ FILE		*f1in=NULL, *f2in=NULL;
 
 				/* running real differences */
 double	diff2sum = 0;
-int	nsum = 0;
+long	nsum = 0;
 
 /* Report usage and exit */
 static void
@@ -129,6 +134,22 @@ real_check(double r1, double r2)
 	return(1);
 }
 
+/* Compare two color values for equivalence */
+static int
+color_check(COLOR c1, COLOR c2)
+{
+	int	p;
+
+	if (!real_check(colval(c1,RED)+colval(c1,GRN)+colval(c1,BLU)*(1./3.),
+			colval(c2,RED)+colval(c2,GRN)+colval(c2,BLU))*(1./3.))
+		return(0);
+
+	p = (colval(c1,GRN) > colval(c1,RED)) ? GRN : RED;
+	if (colval(c1,BLU) > colval(c1,p)) p = BLU;
+	
+	return(real_check(colval(c1,p), colval(c2,p)));
+}
+
 /* Compare two strings for equivalence */
 static int
 equiv_string(char *s1, char *s2)
@@ -223,14 +244,14 @@ setheadvar(char *val, void *p)
 		val++;
 	if (!*val)		/* nothing set? */
 		return(0);
-	vln = strlen(val);	/* eliminate space and newline at end */
-	while (--vln > 0 && isspace(val[vln]))
-		;
-	val[++vln] = '\0';
 				/* check if key to ignore */
 	for (n = 0; hdr_ignkey[n]; n++)
 		if (!strcmp(key, hdr_ignkey[n]))
 			return(0);
+	vln = strlen(val);	/* eliminate space and newline at end */
+	while (isspace(val[--vln]))
+		;
+	val[++vln] = '\0';
 	if (!(tep = lu_find(htp, key)))
 		return(-1);	/* memory allocation error */
 	if (!tep->key)
@@ -331,7 +352,7 @@ identify_type(const char *name, FILE *fin, LUTAB *htp)
 		}
 		if (getheader(fin, setheadvar, htp) < 0) {
 			fputs(name, stderr);
-			fputs(": Unknown error reading header\n", stderr);
+			fputs(": unknown error reading header\n", stderr);
 			return(-1);
 		}
 		adv_linecnt(htp);		/* for trailing emtpy line */
@@ -350,7 +371,7 @@ identify_type(const char *name, FILE *fin, LUTAB *htp)
 badeof:
 	if (report != REP_QUIET) {
 		fputs(name, stdout);
-		fputs(": Unexpected end-of-file\n", stdout);
+		fputs(": unexpected end-of-file\n", stdout);
 	}
 	return(-1);
 }
@@ -396,14 +417,14 @@ compare_binary()
 				return(1);	/* success! */
 			if (report != REP_QUIET) {
 				fputs(f1name, stdout);
-				fputs(": Unexpected end-of-file\n", stdout);
+				fputs(": unexpected end-of-file\n", stdout);
 			}
 			return(0);
 		}
 		if (c2 == EOF) {
 			if (report != REP_QUIET) {
 				fputs(f2name, stdout);
-				fputs(": Unexpected end-of-file\n", stdout);
+				fputs(": unexpected end-of-file\n", stdout);
 			}
 			return(0);
 		}
@@ -443,7 +464,7 @@ compare_text()
 		if (feof(f2in)) {
 			if (report != REP_QUIET) {
 				fputs(f2name, stdout);
-				fputs(": Unexpected end-of-file\n", stdout);
+				fputs(": unexpected end-of-file\n", stdout);
 			}
 			return(0);
 		}
@@ -470,7 +491,7 @@ compare_text()
 			continue;
 		if (report != REP_QUIET) {
 			fputs(f1name, stdout);
-			fputs(": Unexpected end-of-file\n", stdout);
+			fputs(": unexpected end-of-file\n", stdout);
 		}
 		return(0);
 	}
@@ -485,6 +506,10 @@ compare_hdr()
 	COLOR	*scan1, *scan2;
 	int	x, y;
 
+	if (report >= REP_VERBOSE) {
+		fputs(progname, stdout);
+		fputs(": comparing inputs as HDR images\n", stdout);
+	}
 	fgetsresolu(&rs1, f1in);
 	fgetsresolu(&rs2, f2in);
 	if (rs1.rt != rs2.rt) {
@@ -511,19 +536,14 @@ compare_hdr()
 		if ((freadscan(scan1, scanlen(&rs1), f1in) < 0) |
 				(freadscan(scan2, scanlen(&rs2), f2in) < 0)) {
 			if (report != REP_QUIET)
-				printf("%s: Unexpected end-of-file\n",
+				printf("%s: unexpected end-of-file\n",
 						progname);
 			free(scan1);
 			free(scan2);
 			return(0);
 		}
 		for (x = 0; x < scanlen(&rs1); x++) {
-			if (real_check(colval(scan1[x],RED),
-						colval(scan2[x],RED)) &
-					real_check(colval(scan1[x],GRN),
-						colval(scan2[x],GRN)) &
-					real_check(colval(scan1[x],BLU),
-						colval(scan2[x],BLU)))
+			if (color_check(scan1[x], scan2[x]))
 				continue;
 			if (report != REP_QUIET) {
 				printf(
@@ -550,10 +570,6 @@ compare_hdr()
 	return(good_RMS());			/* final check of RMS */
 }
 
-const char	nsuffix[10][3] = {		/* 1st, 2nd, 3rd, etc. */
-			"th","st","nd","rd","th","th","th","th","th","th"
-		};
-
 /* Compare two inputs that are known to be 32-bit floating-point data */
 static int
 compare_float()
@@ -561,6 +577,10 @@ compare_float()
 	long	nread = 0;
 	float	f1, f2;
 
+	if (report >= REP_VERBOSE) {
+		fputs(progname, stdout);
+		fputs(": comparing inputs as 32-bit IEEE floats\n", stdout);
+	}
 	while (getbinary(&f1, sizeof(f1), 1, f1in)) {
 		if (!getbinary(&f2, sizeof(f2), 1, f2in))
 			goto badeof;
@@ -569,14 +589,14 @@ compare_float()
 			continue;
 		if (report != REP_QUIET)
 			printf("%s: %ld%s float values differ\n",
-					progname, nread, nsuffix[nread%10]);
+					progname, nread, num_sfx(nread));
 		return(0);
 	}
 	if (!getbinary(&f2, sizeof(f2), 1, f2in))
 		return(good_RMS());		/* final check of RMS */
 badeof:
 	if (report != REP_QUIET)
-		printf("%s: Unexpected end-of-file\n", progname);
+		printf("%s: unexpected end-of-file\n", progname);
 	return(0);
 }
 
@@ -587,6 +607,10 @@ compare_double()
 	long	nread = 0;
 	double	f1, f2;
 
+	if (report >= REP_VERBOSE) {
+		fputs(progname, stdout);
+		fputs(": comparing inputs as 64-bit IEEE doubles\n", stdout);
+	}
 	while (getbinary(&f1, sizeof(f1), 1, f1in)) {
 		if (!getbinary(&f2, sizeof(f2), 1, f2in))
 			goto badeof;
@@ -594,15 +618,15 @@ compare_double()
 		if (real_check(f1, f2))
 			continue;
 		if (report != REP_QUIET)
-			printf("%s: %ld%s float values differ\n",
-					progname, nread, nsuffix[nread%10]);
+			printf("%s: %ld%s double values differ\n",
+					progname, nread, num_sfx(nread));
 		return(0);
 	}
 	if (!getbinary(&f2, sizeof(f2), 1, f2in))
 		return(good_RMS());		/* final check of RMS */
 badeof:
 	if (report != REP_QUIET)
-		printf("%s: Unexpected end-of-file\n", progname);
+		printf("%s: unexpected end-of-file\n", progname);
 	return(0);
 }
 
@@ -649,17 +673,16 @@ main(int argc, char *argv[])
 		}
 		break;
 	}
-	if (a != argc-2)
+	if (a != argc-2)			/* make sure of two inputs */
 		usage();
-	if (!f1name) f1name = argv[a];
-	if (!f2name) f2name = argv[a+1];
-
-	if (!strcmp(f1name, f2name)) {		/* inputs are same? */
+	if (!strcmp(argv[a], argv[a+1])) {	/* inputs are same? */
 		if (report >= REP_WARN)
 			printf("%s: warning - identical inputs given\n",
 					progname);
 		return(0);
 	}
+	if (!f1name) f1name = argv[a];
+	if (!f2name) f2name = argv[a+1];
 						/* open inputs */
 	SET_FILE_BINARY(stdin);			/* in case we're using it */
 	if (!f1in && !(f1in = fopen(f1name, "rb"))) {