--- ray/src/px/pcomb.c 1993/05/03 12:13:03 2.12 +++ ray/src/px/pcomb.c 1994/02/27 10:16:52 2.14 @@ -21,8 +21,8 @@ static char SCCSid[] = "$SunId$ LBL"; #include "view.h" #define MAXINP 32 /* maximum number of input files */ -#define WINSIZ 9 /* scanline window size */ -#define MIDSCN 4 /* current scan position */ +#define WINSIZ 17 /* scanline window size */ +#define MIDSCN ((WINSIZ-1)/2+1) struct { char *name; /* file or command name */ @@ -106,6 +106,7 @@ char *argv[]; } break; } + newheader("RADIANCE", stdout); /* start header */ /* process files */ for (nfiles = 0; nfiles < MAXINP; nfiles++) { setcolor(input[nfiles].coef, 1.0, 1.0, 1.0); @@ -224,8 +225,9 @@ char *s; double d; COLOR ctmp; - if (isformat(s)) { /* check format */ - formatval(fmt, s); + if (isheadid(s)) /* header id */ + return; /* don't echo */ + if (formatval(fmt, s)) { /* check format */ wrongformat = strcmp(fmt, COLRFMT); return; /* don't echo */ }