8 |
|
*/ |
9 |
|
|
10 |
|
#include <stdlib.h> |
11 |
– |
#include <math.h> |
11 |
|
#include <ctype.h> |
12 |
+ |
#include "rtmath.h" |
13 |
|
#include "platform.h" |
14 |
|
#include "rtio.h" |
15 |
|
#include "resolu.h" |
16 |
|
#include "color.h" |
17 |
+ |
#include "depthcodec.h" |
18 |
+ |
#include "normcodec.h" |
19 |
|
#include "lookup.h" |
20 |
|
/* Reporting levels */ |
21 |
|
#define REP_QUIET 0 /* no reporting */ |
35 |
|
|
36 |
|
int lin1cnt=0, lin2cnt=0; /* file line position */ |
37 |
|
|
38 |
+ |
int comment_c = '\0'; /* comment delimiter for text files */ |
39 |
+ |
|
40 |
+ |
const char nsuffix[10][3] = { /* 1st, 2nd, 3rd, etc. */ |
41 |
+ |
"th","st","nd","rd","th","th","th","th","th","th" |
42 |
+ |
}; |
43 |
+ |
#define num_sfx(n) nsuffix[(n)%10] |
44 |
+ |
|
45 |
|
/* file types */ |
46 |
|
const char *file_type[] = { |
47 |
|
"Unrecognized", |
49 |
|
"ascii", |
50 |
|
COLRFMT, |
51 |
|
CIEFMT, |
52 |
< |
"BINARY_float", |
53 |
< |
"BINARY_double", |
52 |
> |
DEPTH16FMT, |
53 |
> |
NORMAL32FMT, |
54 |
> |
"float", |
55 |
> |
"double", |
56 |
|
"BSDF_RBFmesh", |
57 |
|
"Radiance_octree", |
58 |
|
"Radiance_tmesh", |
59 |
+ |
"8-bit_indexed_name", |
60 |
+ |
"16-bit_indexed_name", |
61 |
+ |
"24-bit_indexed_name", |
62 |
|
"BINARY_unknown", |
63 |
|
NULL /* terminator */ |
64 |
|
}; |
65 |
< |
|
66 |
< |
enum {TYP_UNKNOWN, TYP_TEXT, TYP_ASCII, TYP_RGBE, TYP_XYZE, TYP_FLOAT, |
67 |
< |
TYP_DOUBLE, TYP_RBFMESH, TYP_OCTREE, TYP_TMESH, TYP_BINARY}; |
65 |
> |
/* keep consistent with above */ |
66 |
> |
enum {TYP_UNKNOWN, TYP_TEXT, TYP_ASCII, TYP_RGBE, TYP_XYZE, |
67 |
> |
TYP_DEPTH, TYP_NORM, TYP_FLOAT, TYP_DOUBLE, |
68 |
> |
TYP_RBFMESH, TYP_OCTREE, TYP_TMESH, |
69 |
> |
TYP_ID8, TYP_ID16, TYP_ID24, TYP_BINARY}; |
70 |
|
|
71 |
|
#define has_header(t) (!( 1L<<(t) & (1L<<TYP_TEXT | 1L<<TYP_BINARY) )) |
72 |
|
|
75 |
|
"SOFTWARE", |
76 |
|
"CAPDATE", |
77 |
|
"GMT", |
78 |
+ |
"FRAME", |
79 |
|
NULL /* terminator */ |
80 |
|
}; |
81 |
|
/* header variable settings */ |
86 |
|
#define adv_linecnt(htp) (lin1cnt += (htp == &hdr1), \ |
87 |
|
lin2cnt += (htp == &hdr2)) |
88 |
|
|
89 |
+ |
typedef struct { /* dynamic line buffer */ |
90 |
+ |
char *str; |
91 |
+ |
int len; |
92 |
+ |
int siz; |
93 |
+ |
} LINEBUF; |
94 |
+ |
|
95 |
+ |
#define init_line(bp) ((bp)->str = NULL, (bp)->siz = 0) |
96 |
+ |
/* 100 MByte limit on line buffer */ |
97 |
+ |
#define MAXBUF (100L<<20) |
98 |
+ |
|
99 |
|
/* input files */ |
100 |
|
char *progname = NULL; |
101 |
|
const char stdin_name[] = "<stdin>"; |
102 |
|
const char *f1name=NULL, *f2name=NULL; |
103 |
|
FILE *f1in=NULL, *f2in=NULL; |
104 |
+ |
int f1swap=0, f2swap=0; |
105 |
|
|
106 |
|
/* running real differences */ |
107 |
|
double diff2sum = 0; |
108 |
< |
int nsum = 0; |
108 |
> |
long nsum = 0; |
109 |
|
|
110 |
|
/* Report usage and exit */ |
111 |
|
static void |
113 |
|
{ |
114 |
|
fputs("Usage: ", stderr); |
115 |
|
fputs(progname, stderr); |
116 |
< |
fputs(" [-h][-s|-w|-v][-rel min_test][-rms epsilon][-max epsilon] file1 file2\n", |
116 |
> |
fputs(" [-h][-c#][-s|-w|-v][-rel min_test][-rms epsilon][-max epsilon] reference test\n", |
117 |
|
stderr); |
118 |
< |
exit(1); |
118 |
> |
exit(2); |
119 |
|
} |
120 |
|
|
121 |
+ |
/* Read a text line, increasing buffer size as necessary */ |
122 |
+ |
static int |
123 |
+ |
read_line(LINEBUF *bp, FILE *fp) |
124 |
+ |
{ |
125 |
+ |
static int doneWarn = 0; |
126 |
+ |
|
127 |
+ |
bp->len = 0; |
128 |
+ |
if (!bp->str) { |
129 |
+ |
bp->str = (char *)malloc(bp->siz = 512); |
130 |
+ |
if (!bp->str) |
131 |
+ |
goto memerr; |
132 |
+ |
} |
133 |
+ |
while (fgets(bp->str + bp->len, bp->siz - bp->len, fp)) { |
134 |
+ |
bp->len += strlen(bp->str + bp->len); |
135 |
+ |
if (bp->str[bp->len-1] == '\n') |
136 |
+ |
break; /* found EOL */ |
137 |
+ |
if (bp->len < bp->siz - 4) |
138 |
+ |
continue; /* at EOF? */ |
139 |
+ |
if (bp->siz >= MAXBUF) { |
140 |
+ |
if ((report >= REP_WARN) & !doneWarn) { |
141 |
+ |
fprintf(stderr, |
142 |
+ |
"%s: warning - input line(s) past %ld MByte limit\n", |
143 |
+ |
progname, MAXBUF>>20); |
144 |
+ |
doneWarn++; |
145 |
+ |
} |
146 |
+ |
break; /* return MAXBUF partial line */ |
147 |
+ |
} |
148 |
+ |
if ((bp->siz += bp->siz/2) > MAXBUF) |
149 |
+ |
bp->siz = MAXBUF; |
150 |
+ |
bp->str = (char *)realloc(bp->str, bp->siz); |
151 |
+ |
if (!bp->str) |
152 |
+ |
goto memerr; |
153 |
+ |
} |
154 |
+ |
if (comment_c) { /* elide comment? */ |
155 |
+ |
char *cp = sskip2(bp->str,0); |
156 |
+ |
if (*cp == comment_c) { |
157 |
+ |
*cp++ = '\n'; |
158 |
+ |
*cp = '\0'; |
159 |
+ |
bp->len = cp - bp->str; |
160 |
+ |
} |
161 |
+ |
} |
162 |
+ |
return(bp->len); |
163 |
+ |
memerr: |
164 |
+ |
fprintf(stderr, |
165 |
+ |
"%s: out of memory in read_line() allocating %d byte buffer\n", |
166 |
+ |
progname, bp->siz); |
167 |
+ |
exit(2); |
168 |
+ |
} |
169 |
+ |
|
170 |
+ |
/* Free line buffer */ |
171 |
+ |
static void |
172 |
+ |
free_line(LINEBUF *bp) |
173 |
+ |
{ |
174 |
+ |
if (bp->str) free(bp->str); |
175 |
+ |
init_line(bp); |
176 |
+ |
} |
177 |
+ |
|
178 |
|
/* Get type ID from name (or 0 if not found) */ |
179 |
|
static int |
180 |
|
xlate_type(const char *nm) |
197 |
|
|
198 |
|
if (rel_min > 0) { /* doing relative differences? */ |
199 |
|
double av2 = .25*(r1*r1 + 2.*fabs(r1*r2) + r2*r2); |
200 |
< |
if (av2 > rel_min*rel_min) |
201 |
< |
diff2 /= av2; |
200 |
> |
if (av2 < rel_min*rel_min) |
201 |
> |
av2 = rel_min*rel_min; |
202 |
> |
diff2 /= av2; |
203 |
|
} |
204 |
|
if (max_lim >= 0 && diff2 > max_lim*max_lim) { |
205 |
|
if (report != REP_QUIET) |
206 |
< |
fprintf(stderr, |
207 |
< |
"%s: %sdifference between %.8g and %.8g exceeds epsilon\n", |
206 |
> |
printf( |
207 |
> |
"%s: %sdifference between %.8g and %.8g exceeds epsilon of %.8g\n", |
208 |
|
progname, |
209 |
|
(rel_min > 0) ? "relative " : "", |
210 |
< |
r1, r2); |
210 |
> |
r1, r2, max_lim); |
211 |
|
return(0); |
212 |
|
} |
213 |
|
diff2sum += diff2; |
215 |
|
return(1); |
216 |
|
} |
217 |
|
|
218 |
+ |
/* Compare two color values for equivalence */ |
219 |
+ |
static int |
220 |
+ |
color_check(COLOR c1, COLOR c2) |
221 |
+ |
{ |
222 |
+ |
int p; |
223 |
+ |
|
224 |
+ |
if (!real_check((colval(c1,RED)+colval(c1,GRN)+colval(c1,BLU))*(1./3.), |
225 |
+ |
(colval(c2,RED)+colval(c2,GRN)+colval(c2,BLU))*(1./3.))) |
226 |
+ |
return(0); |
227 |
+ |
|
228 |
+ |
p = (colval(c1,GRN) > colval(c1,RED)) ? GRN : RED; |
229 |
+ |
if (colval(c1,BLU) > colval(c1,p)) p = BLU; |
230 |
+ |
|
231 |
+ |
return(real_check(colval(c1,p), colval(c2,p))); |
232 |
+ |
} |
233 |
+ |
|
234 |
+ |
/* Compare two normal directions for equivalence */ |
235 |
+ |
static int |
236 |
+ |
norm_check(FVECT nv1, FVECT nv2) |
237 |
+ |
{ |
238 |
+ |
double max2 = nv1[2]*nv2[2]; |
239 |
+ |
int imax = 2; |
240 |
+ |
int i = 2; |
241 |
+ |
/* identify largest component */ |
242 |
+ |
while (i--) { |
243 |
+ |
double tm2 = nv1[i]*nv2[i]; |
244 |
+ |
if (tm2 > max2) { |
245 |
+ |
imax = i; |
246 |
+ |
max2 = tm2; |
247 |
+ |
} |
248 |
+ |
} |
249 |
+ |
i = 3; /* compare smaller components */ |
250 |
+ |
while (i--) { |
251 |
+ |
if (i == imax) |
252 |
+ |
continue; |
253 |
+ |
if (!real_check(nv1[i], nv2[i])) |
254 |
+ |
return(0); |
255 |
+ |
} |
256 |
+ |
return(1); |
257 |
+ |
} |
258 |
+ |
|
259 |
|
/* Compare two strings for equivalence */ |
260 |
|
static int |
261 |
|
equiv_string(char *s1, char *s2) |
328 |
|
static int |
329 |
|
setheadvar(char *val, void *p) |
330 |
|
{ |
331 |
+ |
char newval[128]; |
332 |
|
LUTAB *htp = (LUTAB *)p; |
333 |
|
LUENT *tep; |
334 |
|
char *key; |
338 |
|
adv_linecnt(htp); /* side-effect is to count lines */ |
339 |
|
if (!isalpha(*val)) /* key must start line */ |
340 |
|
return(0); |
341 |
+ |
/* check if we need to swap binary data */ |
342 |
+ |
if ((n = isbigendian(val)) >= 0) { |
343 |
+ |
if (nativebigendian() == n) |
344 |
+ |
return(0); |
345 |
+ |
f1swap += (htp == &hdr1); |
346 |
+ |
f2swap += (htp == &hdr2); |
347 |
+ |
return(0); |
348 |
+ |
} |
349 |
|
key = val++; |
350 |
|
while (*val && !isspace(*val) & (*val != '=')) |
351 |
|
val++; |
359 |
|
val++; |
360 |
|
if (!*val) /* nothing set? */ |
361 |
|
return(0); |
226 |
– |
vln = strlen(val); /* eliminate space and newline at end */ |
227 |
– |
while (--vln > 0 && isspace(val[vln])) |
228 |
– |
; |
229 |
– |
val[++vln] = '\0'; |
362 |
|
/* check if key to ignore */ |
363 |
|
for (n = 0; hdr_ignkey[n]; n++) |
364 |
|
if (!strcmp(key, hdr_ignkey[n])) |
365 |
|
return(0); |
366 |
+ |
vln = strlen(val); /* eliminate space and newline at end */ |
367 |
+ |
while (isspace(val[--vln])) |
368 |
+ |
; |
369 |
+ |
val[++vln] = '\0'; |
370 |
|
if (!(tep = lu_find(htp, key))) |
371 |
< |
return(-1); |
371 |
> |
return(-1); /* memory allocation error */ |
372 |
|
if (!tep->key) |
373 |
|
tep->key = strcpy(malloc(kln+1), key); |
374 |
< |
if (tep->data) |
374 |
> |
if (tep->data) { /* check for special cases */ |
375 |
> |
if (!strcmp(key, "EXPOSURE")) { |
376 |
> |
sprintf(newval, "%f", atof(tep->data)*atof(val)); |
377 |
> |
vln = strlen(val = newval); |
378 |
> |
} |
379 |
|
free(tep->data); |
380 |
+ |
} |
381 |
|
tep->data = strcpy(malloc(vln+1), val); |
382 |
|
return(1); |
383 |
|
} |
389 |
|
const LUENT *ep2 = lu_find((LUTAB *)p2, ep1->key); |
390 |
|
if (!ep2 || !ep2->data) { |
391 |
|
if (report != REP_QUIET) |
392 |
< |
fprintf(stderr, "%s: Variable '%s' missing in '%s'\n", |
392 |
> |
printf("%s: variable '%s' missing in '%s'\n", |
393 |
|
progname, ep1->key, f2name); |
394 |
|
return(-1); |
395 |
|
} |
396 |
|
if (!equiv_string((char *)ep1->data, (char *)ep2->data)) { |
397 |
< |
if (report != REP_QUIET) |
398 |
< |
fprintf(stderr, "%s: Header variables '%s' have different values\n", |
397 |
> |
if (report != REP_QUIET) { |
398 |
> |
printf("%s: header variable '%s' has different values\n", |
399 |
|
progname, ep1->key); |
400 |
+ |
if (report >= REP_VERBOSE) { |
401 |
+ |
printf("%s: %s=%s\n", f1name, |
402 |
+ |
ep1->key, (char *)ep1->data); |
403 |
+ |
printf("%s: %s=%s\n", f2name, |
404 |
+ |
ep2->key, (char *)ep2->data); |
405 |
+ |
} |
406 |
+ |
} |
407 |
|
return(-1); |
408 |
|
} |
409 |
|
return(1); /* good match */ |
411 |
|
|
412 |
|
/* Compare two sets of header variables */ |
413 |
|
static int |
414 |
< |
headers_match(LUTAB *hp1, LUTAB *hp2) |
414 |
> |
headers_match() |
415 |
|
{ |
416 |
< |
int ne = lu_doall(hp1, match_val, hp2); |
416 |
> |
int ne = lu_doall(&hdr1, match_val, &hdr2); |
417 |
|
if (ne < 0) |
418 |
|
return(0); /* something didn't match! */ |
419 |
< |
ne = lu_doall(hp2, NULL, NULL) - ne; |
420 |
< |
if (ne) { |
421 |
< |
if (report != REP_QUIET) |
274 |
< |
fprintf(stderr, "%s: '%s' has %d extra header variable(s)\n", |
419 |
> |
/* non-fatal if second header has extra */ |
420 |
> |
if (report >= REP_WARN && (ne = lu_doall(&hdr2, NULL, NULL) - ne)) |
421 |
> |
printf("%s: warning - '%s' has %d extra header setting(s)\n", |
422 |
|
progname, f2name, ne); |
276 |
– |
return(0); |
277 |
– |
} |
423 |
|
return(1); /* good match */ |
424 |
|
} |
425 |
|
|
431 |
|
int c = 0; |
432 |
|
|
433 |
|
while ((c = getc(fin)) != EOF) { |
434 |
+ |
++n; |
435 |
|
if (!c | (c > 127)) |
436 |
|
break; /* non-ascii character */ |
437 |
< |
if (++n >= 10240) |
437 |
> |
if (n >= 10240) |
438 |
|
break; /* enough to be confident */ |
439 |
|
} |
440 |
|
if (!n) |
466 |
|
goto badeof; |
467 |
|
adv_linecnt(htp); /* for #?ID string */ |
468 |
|
if (report >= REP_WARN && strncmp(sbuf, "RADIANCE", 8)) { |
469 |
< |
fputs(name, stderr); |
470 |
< |
fputs(": warning - unexpected header ID: ", stderr); |
471 |
< |
fputs(sbuf, stderr); |
469 |
> |
fputs(name, stdout); |
470 |
> |
fputs(": warning - unexpected header ID: ", stdout); |
471 |
> |
fputs(sbuf, stdout); |
472 |
|
} |
473 |
|
if (getheader(fin, setheadvar, htp) < 0) { |
474 |
|
fputs(name, stderr); |
475 |
< |
fputs(": Unknown error reading header\n", stderr); |
475 |
> |
fputs(": unknown error reading header\n", stderr); |
476 |
|
return(-1); |
477 |
|
} |
478 |
|
adv_linecnt(htp); /* for trailing emtpy line */ |
486 |
|
} |
487 |
|
if (c) |
488 |
|
return(TYP_BINARY); |
343 |
– |
SET_FILE_TEXT(fin); /* originally set to binary */ |
489 |
|
return(TYP_TEXT); |
490 |
|
badeof: |
491 |
|
if (report != REP_QUIET) { |
492 |
< |
fputs(name, stderr); |
493 |
< |
fputs(": Unexpected end-of-file\n", stderr); |
492 |
> |
fputs(name, stdout); |
493 |
> |
fputs(": unexpected end-of-file\n", stdout); |
494 |
|
} |
495 |
|
return(-1); |
496 |
|
} |
503 |
|
return(1); |
504 |
|
if (diff2sum/(double)nsum > rms_lim*rms_lim) { |
505 |
|
if (report != REP_QUIET) |
506 |
< |
fprintf(stderr, |
507 |
< |
"%s: %sRMS difference between '%s' and '%s' of %.5g exceeds limit\n", |
506 |
> |
printf( |
507 |
> |
"%s: %sRMS difference between '%s' and '%s' of %.5g exceeds limit of %.5g\n", |
508 |
|
progname, |
509 |
|
(rel_min > 0) ? "relative " : "", |
510 |
|
f1name, f2name, |
511 |
< |
sqrt(diff2sum/(double)nsum)); |
511 |
> |
sqrt(diff2sum/(double)nsum), rms_lim); |
512 |
|
return(0); |
513 |
|
} |
514 |
|
if (report >= REP_VERBOSE) |
515 |
< |
fprintf(stderr, |
371 |
< |
"%s: %sRMS difference of reals in '%s' and '%s' is %.5g\n", |
515 |
> |
printf("%s: %sRMS difference of reals in '%s' and '%s' is %.5g\n", |
516 |
|
progname, (rel_min > 0) ? "relative " : "", |
517 |
|
f1name, f2name, sqrt(diff2sum/(double)nsum)); |
518 |
|
return(1); |
522 |
|
static int |
523 |
|
compare_binary() |
524 |
|
{ |
525 |
+ |
int c1=0, c2=0; |
526 |
+ |
|
527 |
|
if (report >= REP_VERBOSE) { |
528 |
< |
fputs(progname, stderr); |
529 |
< |
fputs(": comparing inputs as binary\n", stderr); |
528 |
> |
fputs(progname, stdout); |
529 |
> |
fputs(": comparing inputs as binary\n", stdout); |
530 |
|
} |
531 |
|
for ( ; ; ) { /* exact byte matching */ |
532 |
< |
int c1 = getc(f1in); |
533 |
< |
int c2 = getc(f2in); |
532 |
> |
c1 = getc(f1in); |
533 |
> |
c2 = getc(f2in); |
534 |
|
if (c1 == EOF) { |
535 |
|
if (c2 == EOF) |
536 |
|
return(1); /* success! */ |
537 |
|
if (report != REP_QUIET) { |
538 |
< |
fputs(f1name, stderr); |
539 |
< |
fputs(": Unexpected end-of-file\n", stderr); |
538 |
> |
fputs(f1name, stdout); |
539 |
> |
fputs(": unexpected end-of-file\n", stdout); |
540 |
|
} |
541 |
|
return(0); |
542 |
|
} |
543 |
|
if (c2 == EOF) { |
544 |
|
if (report != REP_QUIET) { |
545 |
< |
fputs(f2name, stderr); |
546 |
< |
fputs(": Unexpected end-of-file\n", stderr); |
545 |
> |
fputs(f2name, stdout); |
546 |
> |
fputs(": unexpected end-of-file\n", stdout); |
547 |
|
} |
548 |
|
return(0); |
549 |
|
} |
552 |
|
} |
553 |
|
if (report == REP_QUIET) |
554 |
|
return(0); |
555 |
< |
fprintf(stderr, "%s: binary files '%s' and '%s' differ at offset %ld|%ld\n", |
555 |
> |
printf("%s: binary files '%s' and '%s' differ at byte offset %ld|%ld\n", |
556 |
|
progname, f1name, f2name, ftell(f1in), ftell(f2in)); |
557 |
+ |
if (report >= REP_VERBOSE) |
558 |
+ |
printf("%s: byte in '%s' is 0x%X, byte in '%s' is 0x%X\n", |
559 |
+ |
progname, f1name, c1, f2name, c2); |
560 |
|
return(0); |
561 |
|
} |
562 |
|
|
564 |
|
static int |
565 |
|
compare_text() |
566 |
|
{ |
567 |
< |
char l1buf[4096], l2buf[4096]; |
567 |
> |
LINEBUF l1buf, l2buf; |
568 |
|
|
569 |
|
if (report >= REP_VERBOSE) { |
570 |
< |
fputs(progname, stderr); |
571 |
< |
fputs(": comparing inputs as ASCII text\n", stderr); |
570 |
> |
fputs(progname, stdout); |
571 |
> |
fputs(": comparing inputs as ASCII text", stdout); |
572 |
> |
if (comment_c) { |
573 |
> |
fputs(", ignoring comments starting with '", stdout); |
574 |
> |
fputc(comment_c, stdout); |
575 |
> |
fputc('\'', stdout); |
576 |
> |
} |
577 |
> |
fputc('\n', stdout); |
578 |
|
} |
579 |
< |
/* compare a line at a time */ |
580 |
< |
while (fgets(l1buf, sizeof(l1buf), f1in)) { |
579 |
> |
SET_FILE_TEXT(f1in); /* originally set to binary */ |
580 |
> |
SET_FILE_TEXT(f2in); |
581 |
> |
init_line(&l1buf); init_line(&l2buf); /* compare a line at a time */ |
582 |
> |
while (read_line(&l1buf, f1in)) { |
583 |
|
lin1cnt++; |
584 |
< |
if (!*sskip2(l1buf,0)) |
584 |
> |
if (!*sskip2(l1buf.str,0)) |
585 |
|
continue; /* ignore empty lines */ |
586 |
< |
while (fgets(l2buf, sizeof(l2buf), f2in)) { |
586 |
> |
|
587 |
> |
while (read_line(&l2buf, f2in)) { |
588 |
|
lin2cnt++; |
589 |
< |
if (*sskip2(l2buf,0)) |
589 |
> |
if (*sskip2(l2buf.str,0)) |
590 |
|
break; /* found other non-empty line */ |
591 |
|
} |
592 |
< |
if (feof(f2in)) { |
592 |
> |
if (!l2buf.len) { /* input 2 EOF? */ |
593 |
|
if (report != REP_QUIET) { |
594 |
< |
fputs(f2name, stderr); |
595 |
< |
fputs(": Unexpected end-of-file\n", stderr); |
594 |
> |
fputs(f2name, stdout); |
595 |
> |
fputs(": unexpected end-of-file\n", stdout); |
596 |
|
} |
597 |
+ |
free_line(&l1buf); free_line(&l2buf); |
598 |
|
return(0); |
599 |
|
} |
600 |
|
/* compare non-empty lines */ |
601 |
< |
if (!equiv_string(l1buf, l2buf)) { |
601 |
> |
if (!equiv_string(l1buf.str, l2buf.str)) { |
602 |
|
if (report != REP_QUIET) { |
603 |
< |
fprintf(stderr, "%s: inputs '%s' and '%s' differ at line %d|%d\n", |
603 |
> |
printf("%s: inputs '%s' and '%s' differ at line %d|%d\n", |
604 |
|
progname, f1name, f2name, |
605 |
|
lin1cnt, lin2cnt); |
606 |
< |
if (report >= REP_VERBOSE) { |
607 |
< |
fputs("------------- Mismatch -------------\n", stderr); |
608 |
< |
fprintf(stderr, "%s(%d):\t%s", f1name, |
609 |
< |
lin1cnt, l1buf); |
610 |
< |
fprintf(stderr, "%s(%d):\t%s", f2name, |
611 |
< |
lin2cnt, l2buf); |
606 |
> |
if ( report >= REP_VERBOSE && |
607 |
> |
(l1buf.len < 256) & |
608 |
> |
(l2buf.len < 256) ) { |
609 |
> |
fputs("------------- Mismatch -------------\n", stdout); |
610 |
> |
printf("%s@%d:\t%s", f1name, |
611 |
> |
lin1cnt, l1buf.str); |
612 |
> |
printf("%s@%d:\t%s", f2name, |
613 |
> |
lin2cnt, l2buf.str); |
614 |
|
} |
615 |
|
} |
616 |
+ |
free_line(&l1buf); free_line(&l2buf); |
617 |
|
return(0); |
618 |
|
} |
619 |
|
} |
620 |
< |
/* check for EOF on input 2 */ |
621 |
< |
while (fgets(l2buf, sizeof(l2buf), f2in)) { |
622 |
< |
if (!*sskip2(l2buf,0)) |
620 |
> |
free_line(&l1buf); /* check for EOF on input 2 */ |
621 |
> |
while (read_line(&l2buf, f2in)) { |
622 |
> |
if (!*sskip2(l2buf.str,0)) |
623 |
|
continue; |
624 |
|
if (report != REP_QUIET) { |
625 |
< |
fputs(f1name, stderr); |
626 |
< |
fputs(": Unexpected end-of-file\n", stderr); |
625 |
> |
fputs(f1name, stdout); |
626 |
> |
fputs(": unexpected end-of-file\n", stdout); |
627 |
|
} |
628 |
+ |
free_line(&l2buf); |
629 |
|
return(0); |
630 |
|
} |
631 |
+ |
free_line(&l2buf); |
632 |
|
return(good_RMS()); /* final check for reals */ |
633 |
|
} |
634 |
|
|
635 |
+ |
/* Check image/map resolutions */ |
636 |
+ |
static int |
637 |
+ |
check_resolu(const char *class, RESOLU *r1p, RESOLU *r2p) |
638 |
+ |
{ |
639 |
+ |
if (r1p->rt != r2p->rt) { |
640 |
+ |
if (report != REP_QUIET) |
641 |
+ |
printf( |
642 |
+ |
"%s: %ss '%s' and '%s' have different pixel ordering\n", |
643 |
+ |
progname, class, f1name, f2name); |
644 |
+ |
return(0); |
645 |
+ |
} |
646 |
+ |
if ((r1p->xr != r2p->xr) | (r1p->yr != r2p->yr)) { |
647 |
+ |
if (report != REP_QUIET) |
648 |
+ |
printf( |
649 |
+ |
"%s: %ss '%s' and '%s' are different sizes\n", |
650 |
+ |
progname, class, f1name, f2name); |
651 |
+ |
return(0); |
652 |
+ |
} |
653 |
+ |
return(1); |
654 |
+ |
} |
655 |
+ |
|
656 |
|
/* Compare two inputs that are known to be RGBE or XYZE images */ |
657 |
|
static int |
658 |
|
compare_hdr() |
661 |
|
COLOR *scan1, *scan2; |
662 |
|
int x, y; |
663 |
|
|
664 |
+ |
if (report >= REP_VERBOSE) { |
665 |
+ |
fputs(progname, stdout); |
666 |
+ |
fputs(": comparing inputs as HDR images\n", stdout); |
667 |
+ |
} |
668 |
|
fgetsresolu(&rs1, f1in); |
669 |
|
fgetsresolu(&rs2, f2in); |
670 |
< |
if (rs1.rt != rs2.rt) { |
482 |
< |
if (report != REP_QUIET) |
483 |
< |
fprintf(stderr, |
484 |
< |
"%s: Images '%s' and '%s' have different pixel ordering\n", |
485 |
< |
progname, f1name, f2name); |
670 |
> |
if (!check_resolu("HDR image", &rs1, &rs2)) |
671 |
|
return(0); |
487 |
– |
} |
488 |
– |
if ((rs1.xr != rs2.xr) | (rs1.yr != rs2.yr)) { |
489 |
– |
if (report != REP_QUIET) |
490 |
– |
fprintf(stderr, |
491 |
– |
"%s: Images '%s' and '%s' are different sizes\n", |
492 |
– |
progname, f1name, f2name); |
493 |
– |
return(0); |
494 |
– |
} |
672 |
|
scan1 = (COLOR *)malloc(scanlen(&rs1)*sizeof(COLOR)); |
673 |
|
scan2 = (COLOR *)malloc(scanlen(&rs2)*sizeof(COLOR)); |
674 |
|
if (!scan1 | !scan2) { |
679 |
|
if ((freadscan(scan1, scanlen(&rs1), f1in) < 0) | |
680 |
|
(freadscan(scan2, scanlen(&rs2), f2in) < 0)) { |
681 |
|
if (report != REP_QUIET) |
682 |
< |
fprintf(stderr, "%s: Unexpected end-of-file\n", |
682 |
> |
printf("%s: unexpected end-of-file\n", |
683 |
|
progname); |
684 |
|
free(scan1); |
685 |
|
free(scan2); |
686 |
|
return(0); |
687 |
|
} |
688 |
< |
for (x = scanlen(&rs1); x--; ) { |
689 |
< |
if (real_check(colval(scan1[x],RED), |
513 |
< |
colval(scan2[x],RED)) & |
514 |
< |
real_check(colval(scan1[x],GRN), |
515 |
< |
colval(scan2[x],GRN)) & |
516 |
< |
real_check(colval(scan1[x],BLU), |
517 |
< |
colval(scan2[x],BLU))) |
688 |
> |
for (x = 0; x < scanlen(&rs1); x++) { |
689 |
> |
if (color_check(scan1[x], scan2[x])) |
690 |
|
continue; |
691 |
|
if (report != REP_QUIET) { |
692 |
< |
fprintf(stderr, |
692 |
> |
printf( |
693 |
|
"%s: pixels at scanline %d offset %d differ\n", |
694 |
|
progname, y, x); |
695 |
|
if (report >= REP_VERBOSE) { |
696 |
< |
fprintf(stderr, "%s: (R,G,B)=(%g,%g,%g)\n", |
696 |
> |
printf("%s: (R,G,B)=(%g,%g,%g)\n", |
697 |
|
f1name, colval(scan1[x],RED), |
698 |
|
colval(scan1[x],GRN), |
699 |
|
colval(scan1[x],BLU)); |
700 |
< |
fprintf(stderr, "%s: (R,G,B)=(%g,%g,%g)\n", |
700 |
> |
printf("%s: (R,G,B)=(%g,%g,%g)\n", |
701 |
|
f2name, colval(scan2[x],RED), |
702 |
|
colval(scan2[x],GRN), |
703 |
|
colval(scan2[x],BLU)); |
713 |
|
return(good_RMS()); /* final check of RMS */ |
714 |
|
} |
715 |
|
|
716 |
< |
const char nsuffix[10][3] = { /* 1st, 2nd, 3rd, etc. */ |
717 |
< |
"th","st","nd","rd","th","th","th","th","th","th" |
718 |
< |
}; |
716 |
> |
/* Set reference depth based on header variable */ |
717 |
> |
static int |
718 |
> |
set_refdepth(DEPTHCODEC *dcp, LUTAB *htp) |
719 |
> |
{ |
720 |
> |
static char depthvar[] = DEPTHSTR; |
721 |
> |
const char *drval; |
722 |
|
|
723 |
+ |
depthvar[LDEPTHSTR-1] = '\0'; |
724 |
+ |
drval = (const char *)lu_find(htp, depthvar)->data; |
725 |
+ |
if (!drval) |
726 |
+ |
return(0); |
727 |
+ |
dcp->refdepth = atof(drval); |
728 |
+ |
if (dcp->refdepth <= 0) { |
729 |
+ |
if (report != REP_QUIET) { |
730 |
+ |
fputs(dcp->inpname, stderr); |
731 |
+ |
fputs(": bad reference depth '", stderr); |
732 |
+ |
fputs(drval, stderr); |
733 |
+ |
fputs("'\n", stderr); |
734 |
+ |
} |
735 |
+ |
return(-1); |
736 |
+ |
} |
737 |
+ |
return(1); |
738 |
+ |
} |
739 |
+ |
|
740 |
+ |
/* Compare two encoded depth maps */ |
741 |
+ |
static int |
742 |
+ |
compare_depth() |
743 |
+ |
{ |
744 |
+ |
long nread = 0; |
745 |
+ |
DEPTHCODEC dc1, dc2; |
746 |
+ |
|
747 |
+ |
if (report >= REP_VERBOSE) { |
748 |
+ |
fputs(progname, stdout); |
749 |
+ |
fputs(": comparing inputs as depth maps\n", stdout); |
750 |
+ |
} |
751 |
+ |
set_dc_defaults(&dc1); |
752 |
+ |
dc1.hdrflags = HF_RESIN; |
753 |
+ |
dc1.finp = f1in; |
754 |
+ |
dc1.inpname = f1name; |
755 |
+ |
set_dc_defaults(&dc2); |
756 |
+ |
dc2.hdrflags = HF_RESIN; |
757 |
+ |
dc2.finp = f2in; |
758 |
+ |
dc2.inpname = f2name; |
759 |
+ |
if (report != REP_QUIET) { |
760 |
+ |
dc1.hdrflags |= HF_STDERR; |
761 |
+ |
dc2.hdrflags |= HF_STDERR; |
762 |
+ |
} |
763 |
+ |
if (!process_dc_header(&dc1, 0, NULL)) |
764 |
+ |
return(0); |
765 |
+ |
if (!process_dc_header(&dc2, 0, NULL)) |
766 |
+ |
return(0); |
767 |
+ |
if (!check_resolu("Depth map", &dc1.res, &dc2.res)) |
768 |
+ |
return(0); |
769 |
+ |
if (set_refdepth(&dc1, &hdr1) < 0) |
770 |
+ |
return(0); |
771 |
+ |
if (set_refdepth(&dc2, &hdr2) < 0) |
772 |
+ |
return(0); |
773 |
+ |
while (nread < dc1.res.xr*dc1.res.yr) { |
774 |
+ |
double d1 = decode_depth_next(&dc1); |
775 |
+ |
double d2 = decode_depth_next(&dc2); |
776 |
+ |
if ((d1 < 0) | (d2 < 0)) { |
777 |
+ |
if (report != REP_QUIET) |
778 |
+ |
printf("%s: unexpected end-of-file\n", |
779 |
+ |
progname); |
780 |
+ |
return(0); |
781 |
+ |
} |
782 |
+ |
++nread; |
783 |
+ |
if (real_check(d1, d2)) |
784 |
+ |
continue; |
785 |
+ |
if (report != REP_QUIET) |
786 |
+ |
printf("%s: %ld%s depth values differ\n", |
787 |
+ |
progname, nread, num_sfx(nread)); |
788 |
+ |
return(0); |
789 |
+ |
} |
790 |
+ |
return(good_RMS()); /* final check of RMS */ |
791 |
+ |
} |
792 |
+ |
|
793 |
+ |
/* Compare two encoded normal maps */ |
794 |
+ |
static int |
795 |
+ |
compare_norm() |
796 |
+ |
{ |
797 |
+ |
long nread = 0; |
798 |
+ |
NORMCODEC nc1, nc2; |
799 |
+ |
|
800 |
+ |
if (report >= REP_VERBOSE) { |
801 |
+ |
fputs(progname, stdout); |
802 |
+ |
fputs(": comparing inputs as normal maps\n", stdout); |
803 |
+ |
} |
804 |
+ |
set_nc_defaults(&nc1); |
805 |
+ |
nc1.hdrflags = HF_RESIN; |
806 |
+ |
nc1.finp = f1in; |
807 |
+ |
nc1.inpname = f1name; |
808 |
+ |
set_nc_defaults(&nc2); |
809 |
+ |
nc2.hdrflags = HF_RESIN; |
810 |
+ |
nc2.finp = f2in; |
811 |
+ |
nc2.inpname = f2name; |
812 |
+ |
if (report != REP_QUIET) { |
813 |
+ |
nc1.hdrflags |= HF_STDERR; |
814 |
+ |
nc2.hdrflags |= HF_STDERR; |
815 |
+ |
} |
816 |
+ |
if (!process_nc_header(&nc1, 0, NULL)) |
817 |
+ |
return(0); |
818 |
+ |
if (!process_nc_header(&nc2, 0, NULL)) |
819 |
+ |
return(0); |
820 |
+ |
if (!check_resolu("Normal map", &nc1.res, &nc2.res)) |
821 |
+ |
return(0); |
822 |
+ |
while (nread < nc1.res.xr*nc1.res.yr) { |
823 |
+ |
FVECT nv1, nv2; |
824 |
+ |
int rv1 = decode_normal_next(nv1, &nc1); |
825 |
+ |
int rv2 = decode_normal_next(nv2, &nc2); |
826 |
+ |
if ((rv1 < 0) | (rv2 < 0)) { |
827 |
+ |
if (report != REP_QUIET) |
828 |
+ |
printf("%s: unexpected end-of-file\n", |
829 |
+ |
progname); |
830 |
+ |
return(0); |
831 |
+ |
} |
832 |
+ |
++nread; |
833 |
+ |
if (rv1 == rv2 && (!rv1 || norm_check(nv1, nv2))) |
834 |
+ |
continue; |
835 |
+ |
if (report != REP_QUIET) |
836 |
+ |
printf("%s: %ld%s normal vectors differ\n", |
837 |
+ |
progname, nread, num_sfx(nread)); |
838 |
+ |
return(0); |
839 |
+ |
} |
840 |
+ |
return(good_RMS()); /* final check of RMS */ |
841 |
+ |
} |
842 |
+ |
|
843 |
|
/* Compare two inputs that are known to be 32-bit floating-point data */ |
844 |
|
static int |
845 |
|
compare_float() |
847 |
|
long nread = 0; |
848 |
|
float f1, f2; |
849 |
|
|
850 |
+ |
if (report >= REP_VERBOSE) { |
851 |
+ |
fputs(progname, stdout); |
852 |
+ |
fputs(": comparing inputs as 32-bit IEEE floats\n", stdout); |
853 |
+ |
} |
854 |
|
while (getbinary(&f1, sizeof(f1), 1, f1in)) { |
855 |
|
if (!getbinary(&f2, sizeof(f2), 1, f2in)) |
856 |
|
goto badeof; |
857 |
|
++nread; |
858 |
+ |
if (f1swap) swap32((char *)&f1, 1); |
859 |
+ |
if (f2swap) swap32((char *)&f2, 1); |
860 |
|
if (real_check(f1, f2)) |
861 |
|
continue; |
862 |
|
if (report != REP_QUIET) |
863 |
< |
fprintf(stderr, "%s: %ld%s float values differ\n", |
864 |
< |
progname, nread, nsuffix[nread%10]); |
863 |
> |
printf("%s: %ld%s float values differ\n", |
864 |
> |
progname, nread, num_sfx(nread)); |
865 |
|
return(0); |
866 |
|
} |
867 |
|
if (!getbinary(&f2, sizeof(f2), 1, f2in)) |
868 |
|
return(good_RMS()); /* final check of RMS */ |
869 |
|
badeof: |
870 |
|
if (report != REP_QUIET) |
871 |
< |
fprintf(stderr, "%s: Unexpected end-of-file\n", progname); |
871 |
> |
printf("%s: unexpected end-of-file\n", progname); |
872 |
|
return(0); |
873 |
|
} |
874 |
|
|
879 |
|
long nread = 0; |
880 |
|
double f1, f2; |
881 |
|
|
882 |
+ |
if (report >= REP_VERBOSE) { |
883 |
+ |
fputs(progname, stdout); |
884 |
+ |
fputs(": comparing inputs as 64-bit IEEE doubles\n", stdout); |
885 |
+ |
} |
886 |
|
while (getbinary(&f1, sizeof(f1), 1, f1in)) { |
887 |
|
if (!getbinary(&f2, sizeof(f2), 1, f2in)) |
888 |
|
goto badeof; |
889 |
|
++nread; |
890 |
+ |
if (f1swap) swap64((char *)&f1, 1); |
891 |
+ |
if (f2swap) swap64((char *)&f2, 1); |
892 |
|
if (real_check(f1, f2)) |
893 |
|
continue; |
894 |
|
if (report != REP_QUIET) |
895 |
< |
fprintf(stderr, "%s: %ld%s float values differ\n", |
896 |
< |
progname, nread, nsuffix[nread%10]); |
895 |
> |
printf("%s: %ld%s double values differ\n", |
896 |
> |
progname, nread, num_sfx(nread)); |
897 |
|
return(0); |
898 |
|
} |
899 |
|
if (!getbinary(&f2, sizeof(f2), 1, f2in)) |
900 |
|
return(good_RMS()); /* final check of RMS */ |
901 |
|
badeof: |
902 |
|
if (report != REP_QUIET) |
903 |
< |
fprintf(stderr, "%s: Unexpected end-of-file\n", progname); |
903 |
> |
printf("%s: unexpected end-of-file\n", progname); |
904 |
|
return(0); |
905 |
|
} |
906 |
|
|
917 |
|
case 'h': /* ignore header info. */ |
918 |
|
ign_header = !ign_header; |
919 |
|
continue; |
920 |
+ |
case 'c': /* ignore comments */ |
921 |
+ |
comment_c = argv[a][2]; |
922 |
+ |
continue; |
923 |
|
case 's': /* silent operation */ |
924 |
|
report = REP_QUIET; |
925 |
|
continue; |
950 |
|
} |
951 |
|
break; |
952 |
|
} |
953 |
< |
if (a != argc-2) |
953 |
> |
if (a != argc-2) /* make sure of two inputs */ |
954 |
|
usage(); |
955 |
< |
if (!f1name) f1name = argv[a]; |
646 |
< |
if (!f2name) f2name = argv[a+1]; |
647 |
< |
|
648 |
< |
if (!strcmp(f1name, f2name)) { /* inputs are same? */ |
955 |
> |
if (!strcmp(argv[a], argv[a+1])) { /* inputs are same? */ |
956 |
|
if (report >= REP_WARN) |
957 |
< |
fprintf(stderr, "%s: warning - identical inputs given\n", |
957 |
> |
printf("%s: warning - identical inputs given\n", |
958 |
|
progname); |
959 |
|
return(0); |
960 |
|
} |
961 |
+ |
if (!f1name) f1name = argv[a]; |
962 |
+ |
if (!f2name) f2name = argv[a+1]; |
963 |
|
/* open inputs */ |
964 |
|
SET_FILE_BINARY(stdin); /* in case we're using it */ |
965 |
|
if (!f1in && !(f1in = fopen(f1name, "rb"))) { |
966 |
|
fprintf(stderr, "%s: cannot open for reading\n", f1name); |
967 |
< |
return(1); |
967 |
> |
return(2); |
968 |
|
} |
969 |
|
if (!strcmp(f2name, "-")) { |
970 |
|
f2in = stdin; |
971 |
|
f2name = stdin_name; |
972 |
|
} else if (!(f2in = fopen(f2name, "rb"))) { |
973 |
|
fprintf(stderr, "%s: cannot open for reading\n", f2name); |
974 |
< |
return(1); |
974 |
> |
return(2); |
975 |
|
} |
976 |
|
/* load headers */ |
977 |
|
if ((typ1 = identify_type(f1name, f1in, &hdr1)) < 0) |
978 |
< |
return(1); |
978 |
> |
return(2); |
979 |
|
if ((typ2 = identify_type(f2name, f2in, &hdr2)) < 0) |
980 |
< |
return(1); |
980 |
> |
return(2); |
981 |
|
if (typ1 != typ2) { |
982 |
|
if (report != REP_QUIET) |
983 |
< |
fprintf(stderr, "%s: '%s' is %s and '%s' is %s\n", |
983 |
> |
printf("%s: '%s' format is %s and '%s' is %s\n", |
984 |
|
progname, f1name, file_type[typ1], |
985 |
|
f2name, file_type[typ2]); |
986 |
|
return(1); |
987 |
|
} |
988 |
|
ign_header |= !has_header(typ1); /* check headers if indicated */ |
989 |
< |
if (!ign_header && !headers_match(&hdr1, &hdr2)) |
989 |
> |
if (!ign_header && !headers_match()) |
990 |
|
return(1); |
682 |
– |
lu_done(&hdr1); lu_done(&hdr2); |
991 |
|
if (!ign_header & (report >= REP_WARN)) { |
684 |
– |
if (typ1 == TYP_UNKNOWN) |
685 |
– |
fprintf(stderr, "%s: warning - unrecognized format, comparing as binary\n", |
686 |
– |
progname); |
992 |
|
if (lin1cnt != lin2cnt) |
993 |
< |
fprintf(stderr, "%s: warning - headers are different lengths\n", |
993 |
> |
printf("%s: warning - headers are different lengths\n", |
994 |
|
progname); |
995 |
+ |
if (typ1 == TYP_UNKNOWN) |
996 |
+ |
printf("%s: warning - unrecognized format\n", |
997 |
+ |
progname); |
998 |
|
} |
999 |
< |
if (report >= REP_VERBOSE) |
1000 |
< |
fprintf(stderr, "%s: input file type is %s\n", |
1001 |
< |
progname, file_type[typ1]); |
1002 |
< |
|
999 |
> |
if (report >= REP_VERBOSE) { |
1000 |
> |
printf("%s: data format is %s\n", progname, file_type[typ1]); |
1001 |
> |
if ((typ1 == TYP_FLOAT) | (typ1 == TYP_DOUBLE)) { |
1002 |
> |
if (f1swap) |
1003 |
> |
printf("%s: input '%s' is byte-swapped\n", |
1004 |
> |
progname, f1name); |
1005 |
> |
if (f2swap) |
1006 |
> |
printf("%s: input '%s' is byte-swapped\n", |
1007 |
> |
progname, f2name); |
1008 |
> |
} |
1009 |
> |
} |
1010 |
|
switch (typ1) { /* compare based on type */ |
1011 |
|
case TYP_BINARY: |
1012 |
|
case TYP_TMESH: |
1013 |
|
case TYP_OCTREE: |
1014 |
|
case TYP_RBFMESH: |
1015 |
+ |
case TYP_ID8: |
1016 |
+ |
case TYP_ID16: |
1017 |
+ |
case TYP_ID24: |
1018 |
|
case TYP_UNKNOWN: |
1019 |
|
return( !compare_binary() ); |
1020 |
|
case TYP_TEXT: |
1023 |
|
case TYP_RGBE: |
1024 |
|
case TYP_XYZE: |
1025 |
|
return( !compare_hdr() ); |
1026 |
+ |
case TYP_DEPTH: |
1027 |
+ |
return( !compare_depth() ); |
1028 |
+ |
case TYP_NORM: |
1029 |
+ |
return( !compare_norm() ); |
1030 |
|
case TYP_FLOAT: |
1031 |
|
return( !compare_float() ); |
1032 |
|
case TYP_DOUBLE: |