--- ray/src/util/radcompare.c 2018/10/15 18:21:01 2.2 +++ ray/src/util/radcompare.c 2018/10/15 18:31:15 2.3 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: radcompare.c,v 2.2 2018/10/15 18:21:01 greg Exp $"; +static const char RCSid[] = "$Id: radcompare.c,v 2.3 2018/10/15 18:31:15 greg Exp $"; #endif /* * Compare Radiance files for significant differences @@ -74,6 +74,7 @@ char *progname = NULL; const char stdin_name[] = ""; const char *f1name=NULL, *f2name=NULL; FILE *f1in=NULL, *f2in=NULL; + /* running real differences */ double diff2sum = 0; int nsum = 0; @@ -206,6 +207,7 @@ setheadvar(char *val, void *p) int kln, vln; int n; + adv_linecnt(htp); /* side-effect is to count lines */ if (!isalpha(*val)) /* key must start line */ return(0); key = val++; @@ -236,7 +238,6 @@ setheadvar(char *val, void *p) if (tep->data) free(tep->data); tep->data = strcpy(malloc(vln+1), val); - adv_linecnt(htp); return(1); } @@ -317,12 +318,12 @@ identify_type(const char *name, FILE *fin, LUTAB *htp) char sbuf[32]; if (!fgets(sbuf, sizeof(sbuf), fin)) goto badeof; + adv_linecnt(htp); /* for #?ID string */ if (report >= REP_WARN && strncmp(sbuf, "RADIANCE", 8)) { fputs(name, stderr); fputs(": warning - unexpected header ID: ", stderr); fputs(sbuf, stderr); } - adv_linecnt(htp); /* for #?ID string */ if (getheader(fin, setheadvar, htp) < 0) { fputs(name, stderr); fputs(": Unknown error reading header\n", stderr);