ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/util/rttree_reduce.c
(Generate patch)

Comparing ray/src/util/rttree_reduce.c (file contents):
Revision 2.11 by greg, Tue Aug 11 23:25:11 2015 UTC vs.
Revision 2.13 by schorsch, Sun Mar 6 01:13:18 2016 UTC

# Line 44 | Line 44 | double tthresh;                /* acceptance threshold (TBD) */
44   static void
45   new_kids(TNODE *pn)
46   {
47 +        /* XXX VC warns about 32 bit shift coerced to 64 bit */
48          pn->kid = (TNODE *)calloc(1<<ttrank, sizeof(TNODE));
49          if (pn->kid == NULL)
50                  error(SYSTEM, "out of memory in new_kids");
# Line 155 | Line 156 | print_tree(const TNODE *tp, const int bmin[], int l2s)
156                                  bkmin[j] = bmin[j] + (i>>(ttrank-1-j) & 1);
157                          val = (ttrank == 3) ? dval3(bkmin[0],bkmin[1],bkmin[2])
158                                  : dval4(bkmin[0],bkmin[1],bkmin[2],bkmin[3]);
159 <                        printf((0.1<=val)&(val<10.) ? " %.7f" : " %.3e", val);
159 >                        printf((0.001<=val)&(val<10.) ? " %.7f" : " %.3e", val);
160                  }
161                  fputs(" }\n", stdout);
162                  return;
# Line 276 | Line 277 | load_data(void)
277                  error(COMMAND, "unsupported input format");
278                  break;
279          }
280 +        /* XXX VC warns about 32 bit shift coerced to 64 bit */
281          datarr = (float *)calloc(1<<(log2g*ttrank), sizeof(float));
282          if (datarr == NULL)
283                  error(SYSTEM, "out of memory in load_data");

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines