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

Comparing ray/src/common/tmapcolrs.c (file contents):
Revision 3.14 by schorsch, Sun Jul 27 22:12:01 2003 UTC vs.
Revision 3.15 by schorsch, Fri Jan 2 11:36:26 2004 UTC

# Line 28 | Line 28 | typedef struct {
28          TMbright        inpsfb;         /* encoded tm->inpsf */
29   } COLRDATA;
30  
31 #ifdef NOPROTO
32 static MEM_PTR  colrInit();
33 static void     colrNewSpace();
34 #else
31   static MEM_PTR  colrInit(struct tmStruct *);
32   static void     colrNewSpace(struct tmStruct *);
33 < #endif
33 > static gethfunc headline;
34 >
35   static struct tmPackage colrPkg = {     /* our package functions */
36          colrInit, colrNewSpace, free
37   };
# Line 142 | Line 139 | static struct radhead {
139  
140  
141   static int
142 < headline(s, rh)                 /* grok a header line */
143 < register char   *s;
144 < register struct radhead *rh;
142 > headline(                       /* grok a header line */
143 >        register char   *s,
144 >        void    *vrh
145 > )
146   {
147          char    fmt[32];
148 +        register struct radhead *rh = vrh;
149  
150          if (formatval(fmt, s)) {
151                  if (!strcmp(fmt, COLRFMT))
# Line 196 | Line 195 | FILE   *fp;
195          *lpp = NULL;
196          if (cpp != TM_NOCHROMP) *cpp = NULL;
197          info = rhdefault;                       /* get our header */
198 <        getheader(inpf, headline, (char *)&info);
198 >        getheader(inpf, headline, &info);
199          if ((info.format == FMTBAD) | (info.expos <= 0.) ||
200                          fgetresolu(xp, yp, inpf) < 0) {
201                  err = TM_E_BADFILE; goto done;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines