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.14 by greg, Thu Mar 10 16:25:05 2016 UTC vs.
Revision 2.15 by schorsch, Thu Mar 10 23:18:59 2016 UTC

# Line 276 | Line 276 | load_data(void)
276                  error(COMMAND, "unsupported input format");
277                  break;
278          }
279 <        /* XXX VC warns about 32 bit shift coerced to 64 bit */
280 <        datarr = (float *)calloc(1<<(log2g*ttrank), sizeof(float));
279 >        datarr = (float *)calloc((size_t)1<<(log2g*ttrank), sizeof(float));
280          if (datarr == NULL)
281                  error(SYSTEM, "out of memory in load_data");
282          if (ttrank == 3) {

Diff Legend

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