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.12 by greg, Mon May 3 12:13:03 1993 UTC vs.
Revision 2.14 by greg, Sun Feb 27 10:16:52 1994 UTC

# Line 21 | Line 21 | static char SCCSid[] = "$SunId$ LBL";
21   #include "view.h"
22  
23   #define MAXINP          32              /* maximum number of input files */
24 < #define WINSIZ          9               /* scanline window size */
25 < #define MIDSCN          4               /* current scan position */
24 > #define WINSIZ          17              /* scanline window size */
25 > #define MIDSCN          ((WINSIZ-1)/2+1)
26  
27   struct {
28          char    *name;          /* file or command name */
# 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          }

Diff Legend

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