--- ray/src/rt/p_data.c 2003/03/05 16:16:53 2.7 +++ ray/src/rt/p_data.c 2014/07/08 18:25:00 2.9 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: p_data.c,v 2.7 2003/03/05 16:16:53 greg Exp $"; +static const char RCSid[] = "$Id: p_data.c,v 2.9 2014/07/08 18:25:00 greg Exp $"; #endif /* * p_data.c - routine for stored patterns. @@ -8,10 +8,9 @@ static const char RCSid[] = "$Id: p_data.c,v 2.7 2003/ #include "copyright.h" #include "ray.h" - #include "data.h" - #include "func.h" +#include "rtotypes.h" /* * A stored pattern can either be brightness or @@ -47,15 +46,17 @@ static const char RCSid[] = "$Id: p_data.c,v 2.7 2003/ */ -p_bdata(m, r) /* interpolate brightness data */ -register OBJREC *m; -RAY *r; +int +p_bdata( /* interpolate brightness data */ + OBJREC *m, + RAY *r +) { double bval; double pt[MAXDIM]; DATARRAY *dp; - register MFUNC *mf; - register int i; + MFUNC *mf; + int i; if (m->oargs.nsargs < 4) objerror(m, USER, "bad # arguments"); @@ -82,17 +83,19 @@ computerr: } -p_cdata(m, r) /* interpolate color data */ -register OBJREC *m; -RAY *r; +int +p_cdata( /* interpolate color data */ + OBJREC *m, + RAY *r +) { double col[3]; COLOR cval; double pt[MAXDIM]; int nv; DATARRAY *dp; - register MFUNC *mf; - register int i; + MFUNC *mf; + int i; if (m->oargs.nsargs < 8) objerror(m, USER, "bad # arguments"); @@ -129,16 +132,18 @@ computerr: } -p_pdata(m, r) /* interpolate picture data */ -register OBJREC *m; -RAY *r; +int +p_pdata( /* interpolate picture data */ + OBJREC *m, + RAY *r +) { double col[3]; COLOR cval; double pt[2]; DATARRAY *dp; - register MFUNC *mf; - register int i; + MFUNC *mf; + int i; if (m->oargs.nsargs < 7) objerror(m, USER, "bad # arguments");