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

Comparing ray/src/util/eplus_adduvf.c (file contents):
Revision 2.15 by greg, Fri Feb 28 19:14:10 2014 UTC vs.
Revision 2.18 by schorsch, Sun Mar 6 01:13:18 2016 UTC

# Line 8 | Line 8 | static const char RCSid[] = "$Id$";
8   */
9  
10   #include <stdlib.h>
11 + #include "platform.h"
12   #include "rtio.h"
13   #include "rtmath.h"
14   #include "random.h"
# Line 362 | Line 363 | start_rcontrib(SUBPROC *pd, ZONE *zp)
363          IDF_FIELD       *fptr;
364          int             i, j, n;
365                                                  /* start oconv command */
366 <        sprintf(cbuf, "oconv - > '%s'", temp_octree);
366 >        sprintf(cbuf, "oconv - > \"%s\"", temp_octree);
367          if ((ofp = popen(cbuf, "w")) == NULL) {
368                  fputs(progname, stderr);
369                  fputs(": cannot open oconv process\n", stderr);
# Line 392 | Line 393 | start_rcontrib(SUBPROC *pd, ZONE *zp)
393                                                  /* now subsurfaces */
394          if (zp->ntotal > zp->nsurf) {
395                  if (zp->area_redu != NULL)
396 <                        memset(zp->area_redu, 0, sizeof(float)*zp->nsurf);
397 <                else if ((zp->area_redu = (float *)calloc(zp->nsurf,
396 >                        memset(zp->area_redu, 0, sizeof(float)*zp->ntotal);
397 >                else if ((zp->area_redu = (float *)calloc(zp->ntotal,
398                                                  sizeof(float))) == NULL)
399                          return(0);
400          }

Diff Legend

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