--- ray/src/util/rttree_reduce.c 2015/08/11 23:25:11 2.11 +++ ray/src/util/rttree_reduce.c 2016/03/06 01:13:18 2.13 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rttree_reduce.c,v 2.11 2015/08/11 23:25:11 greg Exp $"; +static const char RCSid[] = "$Id: rttree_reduce.c,v 2.13 2016/03/06 01:13:18 schorsch Exp $"; #endif /* * A utility called by genBSDF.pl to reduce tensor tree samples and output @@ -44,6 +44,7 @@ double tthresh; /* acceptance threshold (TBD) */ static void new_kids(TNODE *pn) { + /* XXX VC warns about 32 bit shift coerced to 64 bit */ pn->kid = (TNODE *)calloc(1<kid == NULL) error(SYSTEM, "out of memory in new_kids"); @@ -155,7 +156,7 @@ print_tree(const TNODE *tp, const int bmin[], int l2s) bkmin[j] = bmin[j] + (i>>(ttrank-1-j) & 1); val = (ttrank == 3) ? dval3(bkmin[0],bkmin[1],bkmin[2]) : dval4(bkmin[0],bkmin[1],bkmin[2],bkmin[3]); - printf((0.1<=val)&(val<10.) ? " %.7f" : " %.3e", val); + printf((0.001<=val)&(val<10.) ? " %.7f" : " %.3e", val); } fputs(" }\n", stdout); return; @@ -276,6 +277,7 @@ load_data(void) error(COMMAND, "unsupported input format"); break; } + /* XXX VC warns about 32 bit shift coerced to 64 bit */ datarr = (float *)calloc(1<<(log2g*ttrank), sizeof(float)); if (datarr == NULL) error(SYSTEM, "out of memory in load_data");