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

Comparing ray/src/rt/rc3.c (file contents):
Revision 2.21 by greg, Fri Mar 4 02:48:14 2016 UTC vs.
Revision 2.24 by greg, Wed Sep 9 21:28:19 2020 UTC

# Line 89 | Line 89 | free_binq(BINQ *bp)
89   /*      for (i = nmods; i--; )
90                  memset(bp->mca[i]->cbin, 0, sizeof(DCOLOR)*bp->mca[i]->nbins);
91   */
92 +        if (bp->next != NULL)
93 +                error(CONSISTENCY, "free_binq() handed list");
94          bp->ndx = 0;
95          bp->next = free_bq;             /* push onto free list */
96          free_bq = bp;
# Line 248 | Line 250 | queue_results(int k)
250          bq->nadded = kida[k].nr;
251                                          /* read from child */
252          for (j = 0; j < nmods; j++)
253 <                if (fread(bq->mca[j]->cbin, sizeof(DCOLOR), bq->mca[j]->nbins,
253 >                if (getbinary(bq->mca[j]->cbin, sizeof(DCOLOR), bq->mca[j]->nbins,
254                                          kida[k].infp) != bq->mca[j]->nbins)
255                          error(SYSTEM, "read error from render process");
256                          
# Line 442 | Line 444 | parental_loop()
444                          }
445                          put_zero_record(++lastray);
446                  }
447 <                if (raysleft && !--raysleft)
447 >                if (!morays())
448                          break;                          /* preemptive EOI */
449          }
450          while (next_child_nq(1) >= 0)           /* empty results queue */
# Line 527 | Line 529 | feeder_loop()
529                                  lastdone = lastray = 0;
530                          ninq = 0;
531                  }
532 <                if (raysleft && !--raysleft)
532 >                if (!morays())
533                          break;                          /* preemptive EOI */
534          }
535          if (ninq) {                             /* polish off input */

Diff Legend

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