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

Comparing ray/src/rt/mx_func.c (file contents):
Revision 2.6 by greg, Tue Feb 25 02:47:22 2003 UTC vs.
Revision 2.9 by greg, Tue Jul 8 18:25:00 2014 UTC

# Line 8 | Line 8 | static const char      RCSid[] = "$Id$";
8   #include "copyright.h"
9  
10   #include  "ray.h"
11 –
11   #include  "func.h"
12 + #include  "rtotypes.h"
13  
14   /*
15   *      A mixture function is specified:
# Line 26 | Line 26 | static const char      RCSid[] = "$Id$";
26   */
27  
28  
29 < mx_func(m, r)                   /* compute mixture function */
30 < register OBJREC  *m;
31 < RAY  *r;
29 > int
30 > mx_func(                        /* compute mixture function */
31 >        OBJREC  *m,
32 >        RAY  *r
33 > )
34   {
35          OBJECT  obj;
36 <        register int  i;
36 >        int  i;
37          double  coef;
38          OBJECT  mod[2];
39 <        register MFUNC  *mf;
39 >        MFUNC  *mf;
40  
41          if (m->oargs.nsargs < 4)
42                  objerror(m, USER, "bad # arguments");
# Line 51 | Line 53 | RAY  *r;
53          setfunc(m, r);
54          errno = 0;
55          coef = evalue(mf->ep[0]);
56 <        if (errno) {
56 >        if (errno == EDOM || errno == ERANGE) {
57                  objerror(m, WARNING, "compute error");
58                  return(0);
59          }

Diff Legend

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