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

Comparing src/util/rttree_reduce.c (file contents):
Revision 2.14 by greg, Thu Mar 10 16:25:05 2016 UTC vs.
Revision 2.16 by greg, Thu Aug 18 00:52:48 2016 UTC

# Line 201 | Line 201 | read_float(float *rowp, int n)
201  
202          if ((rowp == NULL) | (n <= 0))
203                  return(0);
204 <        nread = fread(rowp, sizeof(float), n, stdin);
204 >        nread = getbinary(rowp, sizeof(float), n, stdin);
205          if (nread != n)
206                  error(USER, "unexpected EOF on float input");
207          return(nread);
# Line 227 | Line 227 | read_double(float *rowp, int n)
227                  if (rowbuf == NULL)
228                          error(SYSTEM, "out of memory in read_double");
229          }
230 <        nread = fread(rowbuf, sizeof(double), n, stdin);
230 >        nread = getbinary(rowbuf, sizeof(double), n, stdin);
231          if (nread != n)
232                  error(USER, "unexpected EOF on double input");
233          for (i = 0; i < nread; i++)
# 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