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

Comparing ray/src/util/rcomb.c (file contents):
Revision 2.5 by greg, Tue Dec 19 20:38:38 2023 UTC vs.
Revision 2.6 by greg, Fri Feb 9 19:58:56 2024 UTC

# Line 680 | Line 680 | resize_inparr(int n2alloc)
680   {
681          int     i;
682  
683 <        for (i = nmats; i > n2alloc; i--) {
683 >        if (n2alloc == nall)
684 >                return;
685 >        for (i = nall; i > n2alloc; i--) {
686                  rmx_reset(&mop[i].imx);
687                  if (mop[i].rmp != &mop[i].imx)
688                          rmx_free(mop[i].rmp);
# Line 690 | Line 692 | resize_inparr(int n2alloc)
692                  fputs("Out of memory in resize_inparr()\n", stderr);
693                  exit(1);
694          }
695 <        if (n2alloc > nmats)
696 <                memset(mop+nmats, 0, (n2alloc-nmats)*sizeof(ROPMAT));
695 >        if (n2alloc > nall)
696 >                memset(mop+nall, 0, (n2alloc-nall)*sizeof(ROPMAT));
697          nall = n2alloc;
698   }
699  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines