--- ray/src/util/radcompare.c 2018/10/26 23:45:56 2.16 +++ ray/src/util/radcompare.c 2022/05/24 22:34:18 2.30 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: radcompare.c,v 2.16 2018/10/26 23:45:56 greg Exp $"; +static const char RCSid[] = "$Id: radcompare.c,v 2.30 2022/05/24 22:34:18 greg Exp $"; #endif /* * Compare Radiance files for significant differences @@ -8,12 +8,14 @@ static const char RCSid[] = "$Id: radcompare.c,v 2.16 */ #include -#include #include +#include "rtmath.h" #include "platform.h" #include "rtio.h" #include "resolu.h" #include "color.h" +#include "depthcodec.h" +#include "normcodec.h" #include "lookup.h" /* Reporting levels */ #define REP_QUIET 0 /* no reporting */ @@ -25,6 +27,8 @@ int report = REP_WARN; /* reporting level */ int ign_header = 0; /* ignore header differences? */ +int escape_newlines = 0; /* allow backslash to skip newlines */ + double rel_min = 1e-5; /* positive for relative comparisons */ double rms_lim = 0.01; /* RMS difference limit */ @@ -33,6 +37,8 @@ double max_lim = 0.25; /* difference limit if non-neg int lin1cnt=0, lin2cnt=0; /* file line position */ +int comment_c = '\0'; /* comment delimiter for text files */ + const char nsuffix[10][3] = { /* 1st, 2nd, 3rd, etc. */ "th","st","nd","rd","th","th","th","th","th","th" }; @@ -45,25 +51,34 @@ const char *file_type[] = { "ascii", COLRFMT, CIEFMT, + DEPTH16FMT, + NORMAL32FMT, "float", "double", "BSDF_RBFmesh", "Radiance_octree", "Radiance_tmesh", + "8-bit_indexed_name", + "16-bit_indexed_name", + "24-bit_indexed_name", "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}; +enum {TYP_UNKNOWN, TYP_TEXT, TYP_ASCII, TYP_RGBE, TYP_XYZE, + TYP_DEPTH, TYP_NORM, TYP_FLOAT, TYP_DOUBLE, + TYP_RBFMESH, TYP_OCTREE, TYP_TMESH, + TYP_ID8, TYP_ID16, TYP_ID24, TYP_BINARY}; #define has_header(t) (!( 1L<<(t) & (1L<str + bp->len, bp->siz - bp->len, fp)) { bp->len += strlen(bp->str + bp->len); - if (bp->str[bp->len-1] == '\n') + if (bp->str[bp->len-1] == '\n') { + if (bp->len > 1 && bp->str[bp->len-2] == '\r') { + bp->str[--bp->len] = '\0'; + bp->str[bp->len-1] = '\n'; + } + if (escape_newlines && bp->len > 1 && + bp->str[bp->len-2] == '\\') { + bp->str[--bp->len] = '\0'; + bp->str[bp->len-1] = ' '; + continue; + } break; /* found EOL */ + } if (bp->len < bp->siz - 4) continue; /* at EOF? */ if (bp->siz >= MAXBUF) { @@ -138,6 +165,14 @@ read_line(LINEBUF *bp, FILE *fp) if (!bp->str) goto memerr; } + if (comment_c) { /* elide comment? */ + char *cp = sskip2(bp->str,0); + if (*cp == comment_c) { + *cp++ = '\n'; + *cp = '\0'; + bp->len = cp - bp->str; + } + } return(bp->len); memerr: fprintf(stderr, @@ -176,8 +211,9 @@ real_check(double r1, double r2) if (rel_min > 0) { /* doing relative differences? */ double av2 = .25*(r1*r1 + 2.*fabs(r1*r2) + r2*r2); - if (av2 > rel_min*rel_min) - diff2 /= av2; + if (av2 < rel_min*rel_min) + av2 = rel_min*rel_min; + diff2 /= av2; } if (max_lim >= 0 && diff2 > max_lim*max_lim) { if (report != REP_QUIET) @@ -199,8 +235,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; @@ -209,6 +245,31 @@ color_check(COLOR c1, COLOR c2) return(real_check(colval(c1,p), colval(c2,p))); } +/* Compare two normal directions for equivalence */ +static int +norm_check(FVECT nv1, FVECT nv2) +{ + double max2 = nv1[2]*nv2[2]; + int imax = 2; + int i = 2; + /* identify largest component */ + while (i--) { + double tm2 = nv1[i]*nv2[i]; + if (tm2 > max2) { + imax = i; + max2 = tm2; + } + } + i = 3; /* compare smaller components */ + while (i--) { + if (i == imax) + continue; + if (!real_check(nv1[i], nv2[i])) + return(0); + } + return(1); +} + /* Compare two strings for equivalence */ static int equiv_string(char *s1, char *s2) @@ -281,6 +342,7 @@ equiv_string(char *s1, char *s2) static int setheadvar(char *val, void *p) { + char newval[128]; LUTAB *htp = (LUTAB *)p; LUENT *tep; char *key; @@ -290,6 +352,14 @@ setheadvar(char *val, void *p) adv_linecnt(htp); /* side-effect is to count lines */ if (!isalpha(*val)) /* key must start line */ return(0); + /* check if we need to swap binary data */ + if ((n = isbigendian(val)) >= 0) { + if (nativebigendian() == n) + return(0); + f1swap += (htp == &hdr1); + f2swap += (htp == &hdr2); + return(0); + } key = val++; while (*val && !isspace(*val) & (*val != '=')) val++; @@ -315,8 +385,13 @@ setheadvar(char *val, void *p) return(-1); /* memory allocation error */ if (!tep->key) tep->key = strcpy(malloc(kln+1), key); - if (tep->data) + if (tep->data) { /* check for special cases */ + if (!strcmp(key, "EXPOSURE")) { + sprintf(newval, "%.6e", atof(tep->data)*atof(val)); + vln = strlen(val = newval); + } free(tep->data); + } tep->data = strcpy(malloc(vln+1), val); return(1); } @@ -425,7 +500,6 @@ identify_type(const char *name, FILE *fin, LUTAB *htp) } if (c) return(TYP_BINARY); - SET_FILE_TEXT(fin); /* originally set to binary */ return(TYP_TEXT); badeof: if (report != REP_QUIET) { @@ -508,8 +582,18 @@ compare_text() if (report >= REP_VERBOSE) { fputs(progname, stdout); - fputs(": comparing inputs as ASCII text\n", stdout); + fputs(": comparing inputs as ASCII text", stdout); + if (escape_newlines) + fputs(", allowing escaped newlines", stdout); + if (comment_c) { + fputs(", ignoring comments starting with '", stdout); + fputc(comment_c, stdout); + fputc('\'', stdout); + } + fputc('\n', stdout); } + SET_FILE_TEXT(f1in); /* originally set to binary */ + SET_FILE_TEXT(f2in); init_line(&l1buf); init_line(&l2buf); /* compare a line at a time */ while (read_line(&l1buf, f1in)) { lin1cnt++; @@ -564,6 +648,27 @@ compare_text() return(good_RMS()); /* final check for reals */ } +/* Check image/map resolutions */ +static int +check_resolu(const char *class, RESOLU *r1p, RESOLU *r2p) +{ + if (r1p->rt != r2p->rt) { + if (report != REP_QUIET) + printf( + "%s: %ss '%s' and '%s' have different pixel ordering\n", + progname, class, f1name, f2name); + return(0); + } + if ((r1p->xr != r2p->xr) | (r1p->yr != r2p->yr)) { + if (report != REP_QUIET) + printf( + "%s: %ss '%s' and '%s' are different sizes\n", + progname, class, f1name, f2name); + return(0); + } + return(1); +} + /* Compare two inputs that are known to be RGBE or XYZE images */ static int compare_hdr() @@ -578,20 +683,8 @@ compare_hdr() } fgetsresolu(&rs1, f1in); fgetsresolu(&rs2, f2in); - if (rs1.rt != rs2.rt) { - if (report != REP_QUIET) - printf( - "%s: Images '%s' and '%s' have different pixel ordering\n", - progname, f1name, f2name); + if (!check_resolu("HDR image", &rs1, &rs2)) return(0); - } - if ((rs1.xr != rs2.xr) | (rs1.yr != rs2.yr)) { - if (report != REP_QUIET) - printf( - "%s: Images '%s' and '%s' are different sizes\n", - progname, f1name, f2name); - return(0); - } scan1 = (COLOR *)malloc(scanlen(&rs1)*sizeof(COLOR)); scan2 = (COLOR *)malloc(scanlen(&rs2)*sizeof(COLOR)); if (!scan1 | !scan2) { @@ -636,6 +729,133 @@ compare_hdr() return(good_RMS()); /* final check of RMS */ } +/* Set reference depth based on header variable */ +static int +set_refdepth(DEPTHCODEC *dcp, LUTAB *htp) +{ + static char depthvar[] = DEPTHSTR; + const char *drval; + + depthvar[LDEPTHSTR-1] = '\0'; + drval = (const char *)lu_find(htp, depthvar)->data; + if (!drval) + return(0); + dcp->refdepth = atof(drval); + if (dcp->refdepth <= 0) { + if (report != REP_QUIET) { + fputs(dcp->inpname, stderr); + fputs(": bad reference depth '", stderr); + fputs(drval, stderr); + fputs("'\n", stderr); + } + return(-1); + } + return(1); +} + +/* Compare two encoded depth maps */ +static int +compare_depth() +{ + long nread = 0; + DEPTHCODEC dc1, dc2; + + if (report >= REP_VERBOSE) { + fputs(progname, stdout); + fputs(": comparing inputs as depth maps\n", stdout); + } + set_dc_defaults(&dc1); + dc1.hdrflags = HF_RESIN; + dc1.finp = f1in; + dc1.inpname = f1name; + set_dc_defaults(&dc2); + dc2.hdrflags = HF_RESIN; + dc2.finp = f2in; + dc2.inpname = f2name; + if (report != REP_QUIET) { + dc1.hdrflags |= HF_STDERR; + dc2.hdrflags |= HF_STDERR; + } + if (!process_dc_header(&dc1, 0, NULL)) + return(0); + if (!process_dc_header(&dc2, 0, NULL)) + return(0); + if (!check_resolu("Depth map", &dc1.res, &dc2.res)) + return(0); + if (set_refdepth(&dc1, &hdr1) < 0) + return(0); + if (set_refdepth(&dc2, &hdr2) < 0) + return(0); + while (nread < dc1.res.xr*dc1.res.yr) { + double d1 = decode_depth_next(&dc1); + double d2 = decode_depth_next(&dc2); + if ((d1 < 0) | (d2 < 0)) { + if (report != REP_QUIET) + printf("%s: unexpected end-of-file\n", + progname); + return(0); + } + ++nread; + if (real_check(d1, d2)) + continue; + if (report != REP_QUIET) + printf("%s: %ld%s depth values differ\n", + progname, nread, num_sfx(nread)); + return(0); + } + return(good_RMS()); /* final check of RMS */ +} + +/* Compare two encoded normal maps */ +static int +compare_norm() +{ + long nread = 0; + NORMCODEC nc1, nc2; + + if (report >= REP_VERBOSE) { + fputs(progname, stdout); + fputs(": comparing inputs as normal maps\n", stdout); + } + set_nc_defaults(&nc1); + nc1.hdrflags = HF_RESIN; + nc1.finp = f1in; + nc1.inpname = f1name; + set_nc_defaults(&nc2); + nc2.hdrflags = HF_RESIN; + nc2.finp = f2in; + nc2.inpname = f2name; + if (report != REP_QUIET) { + nc1.hdrflags |= HF_STDERR; + nc2.hdrflags |= HF_STDERR; + } + if (!process_nc_header(&nc1, 0, NULL)) + return(0); + if (!process_nc_header(&nc2, 0, NULL)) + return(0); + if (!check_resolu("Normal map", &nc1.res, &nc2.res)) + return(0); + while (nread < nc1.res.xr*nc1.res.yr) { + FVECT nv1, nv2; + int rv1 = decode_normal_next(nv1, &nc1); + int rv2 = decode_normal_next(nv2, &nc2); + if ((rv1 < 0) | (rv2 < 0)) { + if (report != REP_QUIET) + printf("%s: unexpected end-of-file\n", + progname); + return(0); + } + ++nread; + if (rv1 == rv2 && (!rv1 || norm_check(nv1, nv2))) + continue; + if (report != REP_QUIET) + printf("%s: %ld%s normal vectors differ\n", + progname, nread, num_sfx(nread)); + return(0); + } + return(good_RMS()); /* final check of RMS */ +} + /* Compare two inputs that are known to be 32-bit floating-point data */ static int compare_float() @@ -651,6 +871,8 @@ compare_float() if (!getbinary(&f2, sizeof(f2), 1, f2in)) goto badeof; ++nread; + if (f1swap) swap32((char *)&f1, 1); + if (f2swap) swap32((char *)&f2, 1); if (real_check(f1, f2)) continue; if (report != REP_QUIET) @@ -681,6 +903,8 @@ compare_double() if (!getbinary(&f2, sizeof(f2), 1, f2in)) goto badeof; ++nread; + if (f1swap) swap64((char *)&f1, 1); + if (f2swap) swap64((char *)&f2, 1); if (real_check(f1, f2)) continue; if (report != REP_QUIET) @@ -709,6 +933,12 @@ main(int argc, char *argv[]) case 'h': /* ignore header info. */ ign_header = !ign_header; continue; + case 'n': /* allow newline escapes */ + escape_newlines = !escape_newlines; + continue; + case 'c': /* ignore comments */ + comment_c = argv[a][2]; + continue; case 's': /* silent operation */ report = REP_QUIET; continue; @@ -769,7 +999,7 @@ main(int argc, char *argv[]) return(2); if (typ1 != typ2) { if (report != REP_QUIET) - printf("%s: '%s' is %s and '%s' is %s\n", + printf("%s: '%s' format is %s and '%s' is %s\n", progname, f1name, file_type[typ1], f2name, file_type[typ2]); return(1); @@ -777,7 +1007,6 @@ 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); /* done with header info. */ if (!ign_header & (report >= REP_WARN)) { if (lin1cnt != lin2cnt) printf("%s: warning - headers are different lengths\n", @@ -786,15 +1015,25 @@ main(int argc, char *argv[]) printf("%s: warning - unrecognized format\n", progname); } - if (report >= REP_VERBOSE) - printf("%s: input file type is %s\n", - progname, file_type[typ1]); - + if (report >= REP_VERBOSE) { + printf("%s: data format is %s\n", progname, file_type[typ1]); + if ((typ1 == TYP_FLOAT) | (typ1 == TYP_DOUBLE)) { + if (f1swap) + printf("%s: input '%s' is byte-swapped\n", + progname, f1name); + if (f2swap) + printf("%s: input '%s' is byte-swapped\n", + progname, f2name); + } + } switch (typ1) { /* compare based on type */ case TYP_BINARY: case TYP_TMESH: case TYP_OCTREE: case TYP_RBFMESH: + case TYP_ID8: + case TYP_ID16: + case TYP_ID24: case TYP_UNKNOWN: return( !compare_binary() ); case TYP_TEXT: @@ -803,6 +1042,10 @@ main(int argc, char *argv[]) case TYP_RGBE: case TYP_XYZE: return( !compare_hdr() ); + case TYP_DEPTH: + return( !compare_depth() ); + case TYP_NORM: + return( !compare_norm() ); case TYP_FLOAT: return( !compare_float() ); case TYP_DOUBLE: