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

Comparing ray/src/cal/rcalc.c (file contents):
Revision 1.27 by greg, Thu Aug 18 00:52:47 2016 UTC vs.
Revision 1.28 by greg, Sun May 19 20:02:27 2019 UTC

# Line 303 | Line 303 | execute(           /* process a file */
303   char  *file
304   )
305   {
306 <        int  conditional = vardefined("cond");
306 >        const int  conditional = vardefined("cond");
307 >        const int  set_recno = (varlookup("recno") != NULL);
308 >        const int  set_outno = (varlookup("outno") != NULL);
309          long  nrecs = 0;
310          long  nout = 0;
311          FILE  *fp;
# Line 324 | Line 326 | char  *file
326                  initinp(fp);
327          
328          while (getinputrec(fp)) {
329 <                varset("recno", '=', (double)++nrecs);
330 <                varset("outno", '=', (double)(nout+1));
329 >                ++nrecs;
330 >                if (set_recno)
331 >                        varset("recno", '=', (double)nrecs);
332 >                if (set_outno)
333 >                        varset("outno", '=', (double)(nout+1));
334                  colflg = 0;
335                  eclock++;
336                  if (!conditional || varvalue("cond") > 0.0) {

Diff Legend

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