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.8 by greg, Wed Mar 5 16:16:53 2003 UTC vs.
Revision 2.10 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  "data.h"
13
12   #include  "func.h"
13 + #include  "rtotypes.h"
14  
15   /*
16   *  A stored mixture is specified:
# Line 42 | Line 41 | static const char      RCSid[] = "$Id$";
41   */
42  
43  
44 < mx_data(m, r)                   /* interpolate mixture data */
45 < register OBJREC  *m;
46 < RAY  *r;
44 > int
45 > mx_data(                        /* interpolate mixture data */
46 >        OBJREC  *m,
47 >        RAY  *r
48 > )
49   {
50          OBJECT  obj;
51          double  coef;
52          double  pt[MAXDIM];
53          DATARRAY  *dp;
54          OBJECT  mod[2];
55 <        register MFUNC  *mf;
56 <        register int  i;
55 >        MFUNC  *mf;
56 >        int  i;
57  
58          if (m->oargs.nsargs < 6)
59                  objerror(m, USER, "bad # arguments");
# Line 92 | Line 93 | computerr:
93   }
94  
95  
96 < mx_pdata(m, r)                  /* interpolate mixture picture */
97 < register OBJREC  *m;
98 < RAY  *r;
96 > int
97 > mx_pdata(                       /* interpolate mixture picture */
98 >        OBJREC  *m,
99 >        RAY  *r
100 > )
101   {
102          OBJECT  obj;
103          double  col[3], coef;
104          double  pt[MAXDIM];
105          DATARRAY  *dp;
106          OBJECT  mod[2];
107 <        register MFUNC  *mf;
108 <        register int  i;
107 >        MFUNC  *mf;
108 >        int  i;
109  
110          if (m->oargs.nsargs < 7)
111                  objerror(m, USER, "bad # arguments");

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines