--- ray/src/util/radcompare.c 2018/10/20 15:17:27 2.15 +++ ray/src/util/radcompare.c 2018/12/01 21:09:53 2.18 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: radcompare.c,v 2.15 2018/10/20 15:17:27 greg Exp $"; +static const char RCSid[] = "$Id: radcompare.c,v 2.18 2018/12/01 21:09:53 greg Exp $"; #endif /* * Compare Radiance files for significant differences @@ -64,6 +64,7 @@ const char *hdr_ignkey[] = { "SOFTWARE", "CAPDATE", "GMT", + "FRAME", NULL /* terminator */ }; /* header variable settings */ @@ -199,8 +200,8 @@ 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.)) + 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; @@ -777,13 +778,13 @@ main(int argc, char *argv[]) ign_header |= !has_header(typ1); /* check headers if indicated */ if (!ign_header && !headers_match()) return(1); - lu_done(&hdr1); lu_done(&hdr2); + lu_done(&hdr1); lu_done(&hdr2); /* done with header info. */ if (!ign_header & (report >= REP_WARN)) { - if (typ1 == TYP_UNKNOWN) - printf("%s: warning - unrecognized format, comparing as binary\n", - progname); if (lin1cnt != lin2cnt) printf("%s: warning - headers are different lengths\n", + progname); + if (typ1 == TYP_UNKNOWN) + printf("%s: warning - unrecognized format\n", progname); } if (report >= REP_VERBOSE)