33 |
|
|
34 |
|
int lin1cnt=0, lin2cnt=0; /* file line position */ |
35 |
|
|
36 |
+ |
const char nsuffix[10][3] = { /* 1st, 2nd, 3rd, etc. */ |
37 |
+ |
"th","st","nd","rd","th","th","th","th","th","th" |
38 |
+ |
}; |
39 |
+ |
#define num_sfx(n) nsuffix[(n)%10] |
40 |
+ |
|
41 |
|
/* file types */ |
42 |
|
const char *file_type[] = { |
43 |
|
"Unrecognized", |
53 |
|
"BINARY_unknown", |
54 |
|
NULL /* terminator */ |
55 |
|
}; |
56 |
< |
|
56 |
> |
/* keep consistent with above */ |
57 |
|
enum {TYP_UNKNOWN, TYP_TEXT, TYP_ASCII, TYP_RGBE, TYP_XYZE, TYP_FLOAT, |
58 |
|
TYP_DOUBLE, TYP_RBFMESH, TYP_OCTREE, TYP_TMESH, TYP_BINARY}; |
59 |
|
|
82 |
|
|
83 |
|
/* running real differences */ |
84 |
|
double diff2sum = 0; |
85 |
< |
int nsum = 0; |
85 |
> |
long nsum = 0; |
86 |
|
|
87 |
|
/* Report usage and exit */ |
88 |
|
static void |
123 |
|
if (max_lim >= 0 && diff2 > max_lim*max_lim) { |
124 |
|
if (report != REP_QUIET) |
125 |
|
printf( |
126 |
< |
"%s: %sdifference between %.8g and %.8g exceeds epsilon\n", |
126 |
> |
"%s: %sdifference between %.8g and %.8g exceeds epsilon of %.8g\n", |
127 |
|
progname, |
128 |
|
(rel_min > 0) ? "relative " : "", |
129 |
< |
r1, r2); |
129 |
> |
r1, r2, max_lim); |
130 |
|
return(0); |
131 |
|
} |
132 |
|
diff2sum += diff2; |
134 |
|
return(1); |
135 |
|
} |
136 |
|
|
137 |
+ |
/* Compare two color values for equivalence */ |
138 |
+ |
static int |
139 |
+ |
color_check(COLOR c1, COLOR c2) |
140 |
+ |
{ |
141 |
+ |
int p; |
142 |
+ |
|
143 |
+ |
if (!real_check(colval(c1,RED)+colval(c1,GRN)+colval(c1,BLU)*(1./3.), |
144 |
+ |
colval(c2,RED)+colval(c2,GRN)+colval(c2,BLU))*(1./3.)) |
145 |
+ |
return(0); |
146 |
+ |
|
147 |
+ |
p = (colval(c1,GRN) > colval(c1,RED)) ? GRN : RED; |
148 |
+ |
if (colval(c1,BLU) > colval(c1,p)) p = BLU; |
149 |
+ |
|
150 |
+ |
return(real_check(colval(c1,p), colval(c2,p))); |
151 |
+ |
} |
152 |
+ |
|
153 |
|
/* Compare two strings for equivalence */ |
154 |
|
static int |
155 |
|
equiv_string(char *s1, char *s2) |
244 |
|
val++; |
245 |
|
if (!*val) /* nothing set? */ |
246 |
|
return(0); |
226 |
– |
vln = strlen(val); /* eliminate space and newline at end */ |
227 |
– |
while (--vln > 0 && isspace(val[vln])) |
228 |
– |
; |
229 |
– |
val[++vln] = '\0'; |
247 |
|
/* check if key to ignore */ |
248 |
|
for (n = 0; hdr_ignkey[n]; n++) |
249 |
|
if (!strcmp(key, hdr_ignkey[n])) |
250 |
|
return(0); |
251 |
+ |
vln = strlen(val); /* eliminate space and newline at end */ |
252 |
+ |
while (isspace(val[--vln])) |
253 |
+ |
; |
254 |
+ |
val[++vln] = '\0'; |
255 |
|
if (!(tep = lu_find(htp, key))) |
256 |
|
return(-1); /* memory allocation error */ |
257 |
|
if (!tep->key) |
269 |
|
const LUENT *ep2 = lu_find((LUTAB *)p2, ep1->key); |
270 |
|
if (!ep2 || !ep2->data) { |
271 |
|
if (report != REP_QUIET) |
272 |
< |
printf("%s: Variable '%s' missing in '%s'\n", |
272 |
> |
printf("%s: variable '%s' missing in '%s'\n", |
273 |
|
progname, ep1->key, f2name); |
274 |
|
return(-1); |
275 |
|
} |
276 |
|
if (!equiv_string((char *)ep1->data, (char *)ep2->data)) { |
277 |
|
if (report != REP_QUIET) { |
278 |
< |
printf("%s: Header variable '%s' has different values\n", |
278 |
> |
printf("%s: header variable '%s' has different values\n", |
279 |
|
progname, ep1->key); |
280 |
|
if (report >= REP_VERBOSE) { |
281 |
|
printf("%s: %s=%s\n", f1name, |
298 |
|
return(0); /* something didn't match! */ |
299 |
|
/* non-fatal if second header has extra */ |
300 |
|
if (report >= REP_WARN && (ne = lu_doall(hp2, NULL, NULL) - ne)) |
301 |
< |
printf("%s: '%s' has %d extra header setting(s)\n", |
301 |
> |
printf("%s: warning - '%s' has %d extra header setting(s)\n", |
302 |
|
progname, f2name, ne); |
303 |
|
return(1); /* good match */ |
304 |
|
} |
311 |
|
int c = 0; |
312 |
|
|
313 |
|
while ((c = getc(fin)) != EOF) { |
314 |
+ |
++n; |
315 |
|
if (!c | (c > 127)) |
316 |
|
break; /* non-ascii character */ |
317 |
< |
if (++n >= 10240) |
317 |
> |
if (n >= 10240) |
318 |
|
break; /* enough to be confident */ |
319 |
|
} |
320 |
|
if (!n) |
352 |
|
} |
353 |
|
if (getheader(fin, setheadvar, htp) < 0) { |
354 |
|
fputs(name, stderr); |
355 |
< |
fputs(": Unknown error reading header\n", stderr); |
355 |
> |
fputs(": unknown error reading header\n", stderr); |
356 |
|
return(-1); |
357 |
|
} |
358 |
|
adv_linecnt(htp); /* for trailing emtpy line */ |
371 |
|
badeof: |
372 |
|
if (report != REP_QUIET) { |
373 |
|
fputs(name, stdout); |
374 |
< |
fputs(": Unexpected end-of-file\n", stdout); |
374 |
> |
fputs(": unexpected end-of-file\n", stdout); |
375 |
|
} |
376 |
|
return(-1); |
377 |
|
} |
385 |
|
if (diff2sum/(double)nsum > rms_lim*rms_lim) { |
386 |
|
if (report != REP_QUIET) |
387 |
|
printf( |
388 |
< |
"%s: %sRMS difference between '%s' and '%s' of %.5g exceeds limit\n", |
388 |
> |
"%s: %sRMS difference between '%s' and '%s' of %.5g exceeds limit of %.5g\n", |
389 |
|
progname, |
390 |
|
(rel_min > 0) ? "relative " : "", |
391 |
|
f1name, f2name, |
392 |
< |
sqrt(diff2sum/(double)nsum)); |
392 |
> |
sqrt(diff2sum/(double)nsum), rms_lim); |
393 |
|
return(0); |
394 |
|
} |
395 |
|
if (report >= REP_VERBOSE) |
403 |
|
static int |
404 |
|
compare_binary() |
405 |
|
{ |
406 |
+ |
int c1=0, c2=0; |
407 |
+ |
|
408 |
|
if (report >= REP_VERBOSE) { |
409 |
|
fputs(progname, stdout); |
410 |
|
fputs(": comparing inputs as binary\n", stdout); |
411 |
|
} |
412 |
|
for ( ; ; ) { /* exact byte matching */ |
413 |
< |
int c1 = getc(f1in); |
414 |
< |
int c2 = getc(f2in); |
413 |
> |
c1 = getc(f1in); |
414 |
> |
c2 = getc(f2in); |
415 |
|
if (c1 == EOF) { |
416 |
|
if (c2 == EOF) |
417 |
|
return(1); /* success! */ |
418 |
|
if (report != REP_QUIET) { |
419 |
|
fputs(f1name, stdout); |
420 |
< |
fputs(": Unexpected end-of-file\n", stdout); |
420 |
> |
fputs(": unexpected end-of-file\n", stdout); |
421 |
|
} |
422 |
|
return(0); |
423 |
|
} |
424 |
|
if (c2 == EOF) { |
425 |
|
if (report != REP_QUIET) { |
426 |
|
fputs(f2name, stdout); |
427 |
< |
fputs(": Unexpected end-of-file\n", stdout); |
427 |
> |
fputs(": unexpected end-of-file\n", stdout); |
428 |
|
} |
429 |
|
return(0); |
430 |
|
} |
433 |
|
} |
434 |
|
if (report == REP_QUIET) |
435 |
|
return(0); |
436 |
< |
printf("%s: binary files '%s' and '%s' differ at offset %ld|%ld\n", |
436 |
> |
printf("%s: binary files '%s' and '%s' differ at byte offset %ld|%ld\n", |
437 |
|
progname, f1name, f2name, ftell(f1in), ftell(f2in)); |
438 |
+ |
if (report >= REP_VERBOSE) |
439 |
+ |
printf("%s: byte in '%s' is 0x%X, byte in '%s' is 0x%X\n", |
440 |
+ |
progname, f1name, c1, f2name, c2); |
441 |
|
return(0); |
442 |
|
} |
443 |
|
|
464 |
|
if (feof(f2in)) { |
465 |
|
if (report != REP_QUIET) { |
466 |
|
fputs(f2name, stdout); |
467 |
< |
fputs(": Unexpected end-of-file\n", stdout); |
467 |
> |
fputs(": unexpected end-of-file\n", stdout); |
468 |
|
} |
469 |
|
return(0); |
470 |
|
} |
476 |
|
lin1cnt, lin2cnt); |
477 |
|
if (report >= REP_VERBOSE) { |
478 |
|
fputs("------------- Mismatch -------------\n", stdout); |
479 |
< |
printf("%s(%d):\t%s", f1name, |
479 |
> |
printf("%s@%d:\t%s", f1name, |
480 |
|
lin1cnt, l1buf); |
481 |
< |
printf("%s(%d):\t%s", f2name, |
481 |
> |
printf("%s@%d:\t%s", f2name, |
482 |
|
lin2cnt, l2buf); |
483 |
|
} |
484 |
|
} |
491 |
|
continue; |
492 |
|
if (report != REP_QUIET) { |
493 |
|
fputs(f1name, stdout); |
494 |
< |
fputs(": Unexpected end-of-file\n", stdout); |
494 |
> |
fputs(": unexpected end-of-file\n", stdout); |
495 |
|
} |
496 |
|
return(0); |
497 |
|
} |
506 |
|
COLOR *scan1, *scan2; |
507 |
|
int x, y; |
508 |
|
|
509 |
+ |
if (report >= REP_VERBOSE) { |
510 |
+ |
fputs(progname, stdout); |
511 |
+ |
fputs(": comparing inputs as HDR images\n", stdout); |
512 |
+ |
} |
513 |
|
fgetsresolu(&rs1, f1in); |
514 |
|
fgetsresolu(&rs2, f2in); |
515 |
|
if (rs1.rt != rs2.rt) { |
536 |
|
if ((freadscan(scan1, scanlen(&rs1), f1in) < 0) | |
537 |
|
(freadscan(scan2, scanlen(&rs2), f2in) < 0)) { |
538 |
|
if (report != REP_QUIET) |
539 |
< |
printf("%s: Unexpected end-of-file\n", |
539 |
> |
printf("%s: unexpected end-of-file\n", |
540 |
|
progname); |
541 |
|
free(scan1); |
542 |
|
free(scan2); |
543 |
|
return(0); |
544 |
|
} |
545 |
< |
for (x = scanlen(&rs1); x--; ) { |
546 |
< |
if (real_check(colval(scan1[x],RED), |
516 |
< |
colval(scan2[x],RED)) & |
517 |
< |
real_check(colval(scan1[x],GRN), |
518 |
< |
colval(scan2[x],GRN)) & |
519 |
< |
real_check(colval(scan1[x],BLU), |
520 |
< |
colval(scan2[x],BLU))) |
545 |
> |
for (x = 0; x < scanlen(&rs1); x++) { |
546 |
> |
if (color_check(scan1[x], scan2[x])) |
547 |
|
continue; |
548 |
|
if (report != REP_QUIET) { |
549 |
|
printf( |
570 |
|
return(good_RMS()); /* final check of RMS */ |
571 |
|
} |
572 |
|
|
547 |
– |
const char nsuffix[10][3] = { /* 1st, 2nd, 3rd, etc. */ |
548 |
– |
"th","st","nd","rd","th","th","th","th","th","th" |
549 |
– |
}; |
550 |
– |
|
573 |
|
/* Compare two inputs that are known to be 32-bit floating-point data */ |
574 |
|
static int |
575 |
|
compare_float() |
577 |
|
long nread = 0; |
578 |
|
float f1, f2; |
579 |
|
|
580 |
+ |
if (report >= REP_VERBOSE) { |
581 |
+ |
fputs(progname, stdout); |
582 |
+ |
fputs(": comparing inputs as 32-bit IEEE floats\n", stdout); |
583 |
+ |
} |
584 |
|
while (getbinary(&f1, sizeof(f1), 1, f1in)) { |
585 |
|
if (!getbinary(&f2, sizeof(f2), 1, f2in)) |
586 |
|
goto badeof; |
589 |
|
continue; |
590 |
|
if (report != REP_QUIET) |
591 |
|
printf("%s: %ld%s float values differ\n", |
592 |
< |
progname, nread, nsuffix[nread%10]); |
592 |
> |
progname, nread, num_sfx(nread)); |
593 |
|
return(0); |
594 |
|
} |
595 |
|
if (!getbinary(&f2, sizeof(f2), 1, f2in)) |
596 |
|
return(good_RMS()); /* final check of RMS */ |
597 |
|
badeof: |
598 |
|
if (report != REP_QUIET) |
599 |
< |
printf("%s: Unexpected end-of-file\n", progname); |
599 |
> |
printf("%s: unexpected end-of-file\n", progname); |
600 |
|
return(0); |
601 |
|
} |
602 |
|
|
607 |
|
long nread = 0; |
608 |
|
double f1, f2; |
609 |
|
|
610 |
+ |
if (report >= REP_VERBOSE) { |
611 |
+ |
fputs(progname, stdout); |
612 |
+ |
fputs(": comparing inputs as 64-bit IEEE doubles\n", stdout); |
613 |
+ |
} |
614 |
|
while (getbinary(&f1, sizeof(f1), 1, f1in)) { |
615 |
|
if (!getbinary(&f2, sizeof(f2), 1, f2in)) |
616 |
|
goto badeof; |
618 |
|
if (real_check(f1, f2)) |
619 |
|
continue; |
620 |
|
if (report != REP_QUIET) |
621 |
< |
printf("%s: %ld%s float values differ\n", |
622 |
< |
progname, nread, nsuffix[nread%10]); |
621 |
> |
printf("%s: %ld%s double values differ\n", |
622 |
> |
progname, nread, num_sfx(nread)); |
623 |
|
return(0); |
624 |
|
} |
625 |
|
if (!getbinary(&f2, sizeof(f2), 1, f2in)) |
626 |
|
return(good_RMS()); /* final check of RMS */ |
627 |
|
badeof: |
628 |
|
if (report != REP_QUIET) |
629 |
< |
printf("%s: Unexpected end-of-file\n", progname); |
629 |
> |
printf("%s: unexpected end-of-file\n", progname); |
630 |
|
return(0); |
631 |
|
} |
632 |
|
|
673 |
|
} |
674 |
|
break; |
675 |
|
} |
676 |
< |
if (a != argc-2) |
676 |
> |
if (a != argc-2) /* make sure of two inputs */ |
677 |
|
usage(); |
678 |
< |
if (!f1name) f1name = argv[a]; |
649 |
< |
if (!f2name) f2name = argv[a+1]; |
650 |
< |
|
651 |
< |
if (!strcmp(f1name, f2name)) { /* inputs are same? */ |
678 |
> |
if (!strcmp(argv[a], argv[a+1])) { /* inputs are same? */ |
679 |
|
if (report >= REP_WARN) |
680 |
|
printf("%s: warning - identical inputs given\n", |
681 |
|
progname); |
682 |
|
return(0); |
683 |
|
} |
684 |
+ |
if (!f1name) f1name = argv[a]; |
685 |
+ |
if (!f2name) f2name = argv[a+1]; |
686 |
|
/* open inputs */ |
687 |
|
SET_FILE_BINARY(stdin); /* in case we're using it */ |
688 |
|
if (!f1in && !(f1in = fopen(f1name, "rb"))) { |