ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/rt/rc2.c
(Generate patch)

Comparing ray/src/rt/rc2.c (file contents):
Revision 2.4 by greg, Tue Jun 12 17:20:44 2012 UTC vs.
Revision 2.7 by greg, Thu Nov 15 19:41:03 2012 UTC

# Line 8 | Line 8 | static const char RCSid[] = "$Id$";
8  
9   #include "rcontrib.h"
10   #include "resolu.h"
11 – #include "platform.h"
11  
12   /* Close output stream and free record */
13   static void
# Line 364 | Line 363 | void
363   end_record()
364   {
365          --waitflush;
366 <        lu_doall(&ofiletab, puteol, NULL);
366 >        lu_doall(&ofiletab, &puteol, NULL);
367          if (using_stdout & (outfmt == 'a'))
368                  putc('\n', stdout);
369          if (!waitflush) {
# Line 514 | Line 513 | reload_output()
513                          *(STREAMOUT *)oent->data = sout;
514                  }
515          }
516 <        lu_doall(&ofiletab, myclose, NULL);     /* close all files */
516 >        lu_doall(&ofiletab, &myclose, NULL);    /* close all files */
517   }
518  
519  
# Line 670 | Line 669 | recover_output()
669          }
670                                                  /* seek on all files */
671          nvals = lastout * outvsiz;
672 <        lu_doall(&ofiletab, myseeko, &nvals);
672 >        lu_doall(&ofiletab, &myseeko, &nvals);
673                                                  /* skip repeated input */
674 +        lastout *= accumulate;
675          for (nvals = 0; nvals < lastout; nvals++) {
676                  FVECT   vdummy;
677                  if (getvec(vdummy) < 0 || getvec(vdummy) < 0)
678                          error(USER, "unexpected EOF on input");
679          }
680 <        lastray = lastdone = (RNUMBER)lastout * accumulate;
680 >        lastray = lastdone = (RNUMBER)lastout;
681          if (raysleft)
682                  raysleft -= lastray;
683   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)