ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/px/pcomb.c
(Generate patch)

Comparing ray/src/px/pcomb.c (file contents):
Revision 2.13 by greg, Mon Jun 14 15:59:46 1993 UTC vs.
Revision 2.15 by greg, Fri Feb 17 18:37:20 1995 UTC

# Line 106 | Line 106 | char   *argv[];
106                          }
107                  break;
108          }
109 +        newheader("RADIANCE", stdout);  /* start header */
110                                          /* process files */
111          for (nfiles = 0; nfiles < MAXINP; nfiles++) {
112                  setcolor(input[nfiles].coef, 1.0, 1.0, 1.0);
# Line 224 | Line 225 | char   *s;
225          double  d;
226          COLOR   ctmp;
227  
228 <        if (isformat(s)) {                      /* check format */
229 <                formatval(fmt, s);
228 >        if (isheadid(s))                        /* header id */
229 >                return;         /* don't echo */
230 >        if (formatval(fmt, s)) {                /* check format */
231                  wrongformat = strcmp(fmt, COLRFMT);
232                  return;         /* don't echo */
233          }
# Line 465 | Line 467 | double
467   l_ray(nam)              /* return ray origin or direction */
468   register char   *nam;
469   {
470 <        static long     ltick[MAXINP];
470 >        static unsigned long    ltick[MAXINP];
471          static FVECT    lorg[MAXINP], ldir[MAXINP];
472          FLOAT   loc[2];
473          double  d;

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)