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

Comparing ray/src/rt/mx_data.c (file contents):
Revision 2.11 by greg, Wed Nov 15 18:02:53 2023 UTC vs.
Revision 2.12 by greg, Tue Dec 3 19:36:58 2024 UTC

# Line 73 | Line 73 | mx_data(                       /* interpolate mixture data */
73          errno = 0;
74          for (i = 0; i < dp->nd; i++) {
75                  pt[i] = evalue(mf->ep[i]);
76 <                if (errno == EDOM || errno == ERANGE)
76 >                if ((errno == EDOM) | (errno == ERANGE))
77                          goto computerr;
78          }
79          coef = datavalue(dp, pt);
80          errno = 0;
81          coef = funvalue(m->oargs.sarg[2], 1, &coef);
82 <        if (errno == EDOM || errno == ERANGE)
82 >        if ((errno == EDOM) | (errno == ERANGE))
83                  goto computerr;
84          if (raymixture(r, mod[0], mod[1], coef)) {
85                  if (m->omod != OVOID)
# Line 124 | Line 124 | mx_pdata(                      /* interpolate mixture picture */
124          errno = 0;
125          pt[1] = evalue(mf->ep[0]);      /* y major ordering */
126          pt[0] = evalue(mf->ep[1]);
127 <        if (errno == EDOM || errno == ERANGE)
127 >        if ((errno == EDOM) | (errno == ERANGE))
128                  goto computerr;
129          for (i = 0; i < 3; i++)         /* get pixel from picture */
130                  col[i] = datavalue(dp+i, pt);
131          errno = 0;                      /* evaluate function on pixel */
132          coef = funvalue(m->oargs.sarg[2], 3, col);
133 <        if (errno == EDOM || errno == ERANGE)
133 >        if ((errno == EDOM) | (errno == ERANGE))
134                  goto computerr;
135          if (raymixture(r, mod[0], mod[1], coef)) {
136                  if (m->omod != OVOID)

Diff Legend

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