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.13 by schorsch, Thu Jul 17 09:21:29 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 58 | Line 55 | int    len;
55  
56          if (tmTop == NULL)
57                  returnErr(TM_E_TMINVAL);
58 <        if (ls == NULL | scan == NULL | len < 0)
58 >        if ((ls == NULL) | (scan == NULL) | (len < 0))
59                  returnErr(TM_E_ILLEGAL);
60   #if TM_PIC_CTRANS
61          if (tmNeedMatrix(tmTop)) {              /* need floating point */
# 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 187 | Line 186 | FILE   *fp;
186                                                  /* check arguments */
187          if (tmTop == NULL)
188                  returnErr(TM_E_TMINVAL);
189 <        if (lpp == NULL | xp == NULL | yp == NULL |
190 <                        (fname == NULL & fp == TM_GETFILE))
189 >        if ((lpp == NULL) | (xp == NULL) | (yp == NULL) |
190 >                        ((fname == NULL) & (fp == TM_GETFILE)))
191                  returnErr(TM_E_ILLEGAL);
192          *xp = *yp = 0;                          /* error precaution */
193          if ((inpf = fp) == TM_GETFILE && (inpf = fopen(fname, "r")) == NULL)
# 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);
199 <        if (info.format == FMTBAD | info.expos <= 0. ||
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;
202          }
# Line 305 | Line 304 | char   *fname;
304                  rp = (BYTE *)malloc(sizeof(BYTE) * *xp * *yp);
305          else
306                  rp = (BYTE *)malloc(3*sizeof(BYTE) * *xp * *yp);
307 <        if ((*psp = rp) == NULL | scan == NULL) {
307 >        if (((*psp = rp) == NULL) | (scan == NULL)) {
308                  pclose(infp);
309                  returnErr(TM_E_NOMEM);
310          }
# Line 351 | Line 350 | FILE   *fp;
350          TMbright        *lp;
351          int     err;
352                                                  /* check arguments */
353 <        if (psp == NULL | xp == NULL | yp == NULL | monpri == NULL |
354 <                        (fname == NULL & fp == TM_GETFILE))
353 >        if ((psp == NULL) | (xp == NULL) | (yp == NULL) | (monpri == NULL) |
354 >                        ((fname == NULL) & (fp == TM_GETFILE)))
355                  returnErr(TM_E_ILLEGAL);
356                                                  /* set defaults */
357          if (gamval < MINGAM) gamval = DEFGAM;

Diff Legend

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