--- ray/src/cv/pabopto2bsdf.c 2014/03/23 17:46:25 2.23 +++ ray/src/cv/pabopto2bsdf.c 2014/06/06 00:58:22 2.25 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: pabopto2bsdf.c,v 2.23 2014/03/23 17:46:25 greg Exp $"; +static const char RCSid[] = "$Id: pabopto2bsdf.c,v 2.25 2014/06/06 00:58:22 greg Exp $"; #endif /* * Load measured BSDF data in PAB-Opto format. @@ -186,7 +186,7 @@ main(int argc, char *argv[]) for (i = 0; i < ninpfiles; i++) if (!init_pabopto_inp(i, argv[i+1])) return(1); - qsort(inpfile, ninpfiles, sizeof(PGINPUT), &cmp_indir); + qsort(inpfile, ninpfiles, sizeof(PGINPUT), cmp_indir); /* compile measurements */ for (i = 0; i < ninpfiles; i++) if (!add_pabopto_inp(i)) @@ -238,7 +238,7 @@ main(int argc, char *argv[]) if (dsf_grid[i][j].sum.n > 0) { ovec_from_pos(dir, i, j); bsdf = dsf_grid[i][j].sum.v / - (dsf_grid[i][j].sum.n*output_orient*dir[2]); + ((double)dsf_grid[i][j].sum.n*output_orient*dir[2]); if (bsdf <= bsdf_min*.6) continue; bsdf = log(bsdf + 1e-5) - min_log;