--- ray/src/px/pfilt.c 1990/09/13 09:46:00 1.10 +++ ray/src/px/pfilt.c 1992/11/12 09:05:17 2.7 @@ -1,4 +1,4 @@ -/* Copyright (c) 1986 Regents of the University of California */ +/* Copyright (c) 1992 Regents of the University of California */ #ifndef lint static char SCCSid[] = "$SunId$ LBL"; @@ -10,43 +10,53 @@ static char SCCSid[] = "$SunId$ LBL"; * 9/26/85 */ -#include +#include "standard.h" #include #include "color.h" -extern char *malloc(); +#include "resolu.h" -#define CHECKRAD 1.5 /* radius to check for filtering */ +#include "paths.h" +extern float *matchlamp(); + +#define FEQ(a,b) ((a) >= .98*(b) && (a) <= 1.02*(b)) + +#define CHECKRAD 1.5 /* radius to check for filtering */ + COLOR exposure = WHTCOLOR; /* exposure for the frame */ -double rad = 0.0; /* output pixel radius for filtering */ +double rad = 0.0; /* output pixel radius for filtering */ int nrows = 0; /* number of rows for output */ int ncols = 0; /* number of columns for output */ -double x_c = 1.0; /* ratio of output x size to input */ -double y_r = 1.0; /* ratio of output y size to input */ +double x_c = 1.0; /* ratio of output x size to input */ +double y_r = 1.0; /* ratio of output y size to input */ int singlepass = 0; /* true means skip first pass */ int avghot = 0; /* true means average in bright spots */ -double hotlvl = 1000.0; /* level considered "hot" */ +double hotlvl = 1000.0; /* level considered "hot" */ int npts = 0; /* (half) number of points for stars */ -double spread = 1e-4; /* spread for star points */ +double spread = 1e-4; /* spread for star points */ -#define TEMPLATE "/usr/tmp/pfXXXXXX" - char *tfname = NULL; +char *lampdat = "lamp.tab"; /* lamp data file */ + +int order; /* scanline ordering of input */ int xres, yres; /* resolution of input */ -double inpaspect = 1.0; /* pixel aspect ratio of input */ +double inpaspect = 1.0; /* pixel aspect ratio of input */ +int correctaspect = 0; /* aspect ratio correction? */ +int wrongformat = 0; + int xrad; /* x window size */ int yrad; /* y window size */ @@ -61,28 +71,33 @@ main(argc, argv) int argc; char **argv; { - extern char *mktemp(); - extern double atof(), pow(); extern long ftell(); extern int quit(), headline(); FILE *fin; + float *lampcolor; + char *lamptype = NULL; long fpos; - double outaspect = 0.0; - double d; - int i; - + double outaspect = 0.0; + double d; + int i, j; +#ifdef MSDOS + extern int _fmode; + _fmode = O_BINARY; + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); +#endif if (signal(SIGINT, quit) == SIG_IGN) signal(SIGINT, SIG_IGN); if (signal(SIGHUP, quit) == SIG_IGN) signal(SIGINT, SIG_IGN); signal(SIGTERM, quit); signal(SIGPIPE, quit); -#ifdef SIGXCPU +#ifdef SIGXCPU signal(SIGXCPU, quit); signal(SIGXFSZ, quit); #endif - progname = argv[0]; + progname = argv[0] = fixargv0(argv[0]); for (i = 1; i < argc; i++) if (argv[i][0] == '-') @@ -103,6 +118,9 @@ char **argv; } else nrows = atoi(argv[i]); break; + case 'c': + correctaspect = !correctaspect; + break; case 'p': i++; outaspect = atof(argv[i]); @@ -112,6 +130,12 @@ char **argv; d = pow(2.0, atof(argv[i+1])); else d = atof(argv[i+1]); + if (d < 1e-20 || d > 1e20) { + fprintf(stderr, + "%s: exposure out of range\n", + argv[0]); + exit(1); + } switch (argv[i][2]) { case '\0': scalecolor(exposure, d); @@ -130,6 +154,12 @@ char **argv; } i++; break; + case 'f': + lampdat = argv[++i]; + break; + case 't': + lamptype = argv[++i]; + break; case '1': singlepass = 1; break; @@ -163,7 +193,20 @@ char **argv; } else break; - + /* get lamp data (if necessary) */ + if (lamptype != NULL) { + if (loadlamps(lampdat) < 0) + quit(1); + if ((lampcolor = matchlamp(lamptype)) == NULL) { + fprintf(stderr, "%s: unknown lamp type\n", lamptype); + quit(1); + } + for (i = 0; i < 3; i++) + if (lampcolor[i] > 1e-4) + colval(exposure,i) /= lampcolor[i]; + freelamps(); + } + /* open input file */ if (i == argc) { if (singlepass) fin = stdin; @@ -191,14 +234,21 @@ char **argv; quit(1); } /* get header */ - getheader(fin, headline); + getheader(fin, headline, NULL); + if (wrongformat) { + fprintf(stderr, "%s: input must be a Radiance picture\n", + progname); + quit(1); + } /* add new header info. */ printargs(i, argv, stdout); /* get picture size */ - if (fgetresolu(&xres, &yres, fin) != (YMAJOR|YDECR)) { + if ((order = fgetresolu(&xres, &yres, fin)) < 0) { fprintf(stderr, "%s: bad picture size\n", progname); quit(1); } + if (!(order & YMAJOR)) + inpaspect = 1.0/inpaspect; /* compute output resolution */ if (ncols <= 0) ncols = x_c*xres + .5; @@ -237,9 +287,15 @@ char **argv; headline(s) /* process line from header */ char *s; { + char fmt[32]; + fputs(s, stdout); /* copy to output */ if (isaspect(s)) /* get aspect ratio */ inpaspect *= aspectval(s); + else if (isformat(s)) { + formatval(fmt, s); + wrongformat = strcmp(fmt, COLRFMT); + } } @@ -273,14 +329,15 @@ FILE *in; } for (i = 0; i < yres; i++) { if (freadscan(scan, xres, in) < 0) { - nrows = nrows * i / yres; /* adjust frame */ + nrows = (long)nrows * i / yres; /* adjust frame */ if (nrows <= 0) { fprintf(stderr, "%s: empty frame\n", progname); quit(1); } fprintf(stderr, "%s: warning - partial frame (%d%%)\n", - progname, 100*i/yres); + progname, (int)(100L*i/yres)); yres = i; + y_r = (double)nrows/yres; break; } pass1scan(scan, i); @@ -295,7 +352,7 @@ FILE *in; int yread; int ycent, xcent; int r, c; - + pass2init(); scan2init(); yread = 0; @@ -337,7 +394,8 @@ FILE *in; scan2init() /* prepare scanline arrays */ { - double d; + COLOR ctmp; + double d; register int i; if (rad <= 0.0) { @@ -352,7 +410,7 @@ scan2init() /* prepare scanline arrays */ initmask(); /* initialize filter table */ } - barsize = 2 * yrad; + barsize = 2*yrad + 1; scanin = (COLOR **)malloc(barsize*sizeof(COLOR *)); for (i = 0; i < barsize; i++) { scanin[i] = (COLOR *)malloc(xres*sizeof(COLOR)); @@ -366,15 +424,25 @@ scan2init() /* prepare scanline arrays */ fprintf(stderr, "%s: out of memory\n", progname); quit(1); } - /* record pixel aspect and exposure */ - d = x_c / y_r; - if (d < .99 || d > 1.01) - fputaspect(d, stdout); + /* record pixel aspect ratio */ + if (!correctaspect) { + d = order & YMAJOR ? x_c/y_r : y_r/x_c ; + if (!FEQ(d,1.0)) + fputaspect(d, stdout); + } + /* record exposure */ d = bright(exposure); - if (d < .995 || d > 1.005) + if (!FEQ(d,1.0)) fputexpos(d, stdout); + /* record color correction */ + copycolor(ctmp, exposure); + scalecolor(ctmp, 1.0/d); + if (!FEQ(colval(ctmp,RED),colval(ctmp,GRN)) || + !FEQ(colval(ctmp,GRN),colval(ctmp,BLU))) + fputcolcor(ctmp, stdout); printf("\n"); - fputresolu(YMAJOR|YDECR, ncols, nrows, stdout); /* resolution */ + /* write out resolution */ + fputresolu(order, ncols, nrows, stdout); }