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

Comparing ray/src/util/rcollate.c (file contents):
Revision 2.20 by greg, Tue Jun 16 19:06:29 2015 UTC vs.
Revision 2.21 by greg, Tue Jun 16 20:35:56 2015 UTC

# Line 74 | Line 74 | load_stream(MEMLOAD *mp, FILE *fp)
74                  return(-1);
75          while ((nr = fread(buf, 1, sizeof(buf), fp)) > 0) {
76                  if (!alloced)
77 <                        mp->base = malloc(nr);
77 >                        mp->base = malloc(alloced = nr);
78                  else if (mp->len+nr > alloced)
79                          mp->base = realloc(mp->base,
80                                  alloced = alloced*(2+(nr==sizeof(buf)))/2+nr);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines