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

Comparing ray/src/rt/RcontribSimulManager.cpp (file contents):
Revision 2.18 by greg, Fri Oct 24 18:37:05 2025 UTC vs.
Revision 2.19 by greg, Sat Oct 25 03:30:35 2025 UTC

# Line 414 | Line 414 | RcontribSimulManager::PrepOutput()
414          }
415          rowsDone.NewBitMap(outList->nRows);     // create row completion map
416          rowsDone.ClearBits(0, rInPos, true);
417 <        return rInPos;
417 >        return nrDone = rInPos;
418   }
419  
420   // Create header in open write-only channel
# Line 534 | Line 534 | RcontribOutput::CheckHeader(const RcontribSimulManager
534                  return -1;
535          }
536                                                  // check #columns
537 <        if (((cp = findArgs(hdr, "NCOLS=", begData)) && atoi(cp)*esiz != rowBytes) ||
538 <                        !rcp->xres | (rowBytes > esiz)) {
539 <                sprintf(errmsg, "expected NCOLS=%d in '%s'",
540 <                                int(rowBytes/esiz), GetName());
537 >        if ((cp = findArgs(hdr, "NCOLS=", begData)) ? (atoi(cp)*esiz != rowBytes)
538 >                                                    : (!rcp->xres | (rowBytes > esiz))) {
539 >                sprintf(errmsg, "expected NCOLS=%d in '%s'", int(rowBytes/esiz), GetName());
540                  error(USER, errmsg);
541                  return -1;
542          }
# Line 579 | Line 578 | RcontribSimulManager::ResetRow(int r)
578                          return false;
579  
580          rowsDone.ClearBits(r, rInPos-r, false);
581 <        rInPos = r;
581 >        nrDone = rInPos = r;
582          return true;
583   }
584  
# Line 738 | Line 737 | RcontribSimulManager::UpdateRowsDone(int r)
737                  error(WARNING, "redundant call to UpdateRowsDone()");
738                  return false;
739          }
740 <        int     nDone = GetRowFinished();
741 <        if (nDone <= r)
740 >        GetRowFinished();
741 >        if (nrDone <= r)
742                  return true;                    // nothing to update, yet
743          for (RcontribOutput *op = outList; op; op = op->next)
744 <                if (!op->SetRowsDone(nDone))
744 >                if (!op->SetRowsDone(nrDone))
745                          return false;
746          return true;                            // up-to-date
747   }

Diff Legend

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