--- ray/src/px/pfilt.c 1989/04/29 09:22:54 1.6 +++ ray/src/px/pfilt.c 1993/06/25 15:01:17 2.9 @@ -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"; @@ -8,51 +8,72 @@ static char SCCSid[] = "$SunId$ LBL"; * pfilt.c - program to post-process picture file. * * 9/26/85 + * 6/23/93 Added additional buffers for value spreading */ -#include +#include "standard.h" #include #include "color.h" +#include "resolu.h" -extern char *malloc(); +#include "paths.h" -#define CHECKRAD 1.5 /* radius to check for filtering */ +extern float *matchlamp(); +#define FEQ(a,b) ((a) >= .98*(b) && (a) <= 1.02*(b)) + +double CHECKRAD = 1.5; /* radius to check for filtering */ + +#define THRESHRAD 5.0 /* maximum sample spread in output */ + 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 */ +double thresh = 0.0; /* maximum contribution for subpixel */ + 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 = 100.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 */ +int correctaspect = 0; /* aspect ratio correction? */ -int xrad; /* x window size */ -int yrad; /* y window size */ +int wrongformat = 0; +int xrad; /* x search radius */ +int yrad; /* y search radius */ +int xbrad; /* x box size */ +int ybrad; /* y box size */ + int barsize; /* size of input scan bar */ COLOR **scanin; /* input scan bar */ COLOR *scanout; /* output scan line */ +COLOR **scoutbar; /* output scan bar (if thresh > 0) */ +float **greybar; /* grey-averaged input values */ +int obarsize = 0; /* size of output scan bar */ +int orad = 0; /* output window radius */ char *progname; @@ -61,27 +82,33 @@ main(argc, argv) int argc; char **argv; { - extern char *mktemp(); - extern double atof(), pow(); extern long ftell(); - extern int quit(); + extern int quit(), headline(); FILE *fin; + float *lampcolor; + char *lamptype = NULL; long fpos; - 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] == '-') @@ -102,11 +129,24 @@ char **argv; } else nrows = atoi(argv[i]); break; + case 'c': + correctaspect = !correctaspect; + break; + case 'p': + i++; + outaspect = atof(argv[i]); + break; case 'e': if (argv[i+1][0] == '+' || argv[i+1][0] == '-') 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); @@ -125,13 +165,19 @@ char **argv; } i++; break; + case 'f': + lampdat = argv[++i]; + break; + case 't': + lamptype = argv[++i]; + break; case '1': singlepass = 1; break; case '2': singlepass = 0; break; - case 'p': + case 'n': npts = atoi(argv[++i]) / 2; break; case 's': @@ -146,8 +192,13 @@ char **argv; case 'r': rad = atof(argv[++i]); break; + case 'm': + thresh = atof(argv[++i]); + if (rad <= FTINY) + rad = 1.0; + break; case 'b': - rad = 0.0; + rad = thresh = 0.0; break; default:; badopt: @@ -158,7 +209,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; @@ -185,26 +249,38 @@ char **argv; fprintf(stderr, "%s: bad # file arguments\n", progname); quit(1); } - /* copy header */ - copyheader(fin, stdout); + /* get header */ + 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 (fscanf(fin, "-Y %d +X %d\n", &yres, &xres) != 2) { + if ((order = fgetresolu(&xres, &yres, fin)) < 0) { fprintf(stderr, "%s: bad picture size\n", progname); quit(1); } - if (ncols > 0) - x_c = (double)ncols/xres; - else + if (!(order & YMAJOR)) + inpaspect = 1.0/inpaspect; + /* compute output resolution */ + if (ncols <= 0) ncols = x_c*xres + .5; - if (nrows > 0) - y_r = (double)nrows/yres; - else + if (nrows <= 0) nrows = y_r*yres + .5; + if (outaspect > .01) { + d = inpaspect * yres/xres / outaspect; + if (d * ncols > nrows) + ncols = nrows / d; + else + nrows = ncols * d; + } + x_c = (double)ncols/xres; + y_r = (double)nrows/yres; - if (singlepass) { - /* skip exposure, etc. */ + if (singlepass) { /* skip exposure, etc. */ pass1default(); pass2(fin); quit(0); @@ -224,6 +300,23 @@ 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 (isexpos(s)) + hotlvl *= exposval(s); + else if (isformat(s)) { + formatval(fmt, s); + wrongformat = strcmp(fmt, COLRFMT); + } +} + + copyfile(in, out) /* copy a file */ register FILE *in, *out; { @@ -254,14 +347,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); @@ -276,7 +370,7 @@ FILE *in; int yread; int ycent, xcent; int r, c; - + pass2init(); scan2init(); yread = 0; @@ -295,39 +389,59 @@ FILE *in; } yread++; } + if (obarsize > 0) + scan2sync(r); for (c = 0; c < ncols; c++) { xcent = (long)c*xres/ncols; - if (rad <= 0.0) - dobox(scanout[c], xcent, ycent, c, r); - else + if (thresh > FTINY) + dothresh(xcent, ycent, c, r); + else if (rad > FTINY) dogauss(scanout[c], xcent, ycent, c, r); + else + dobox(scanout[c], xcent, ycent, c, r); } - if (fwritescan(scanout, ncols, stdout) < 0) { + if (scanout != NULL && fwritescan(scanout, ncols, stdout) < 0) { fprintf(stderr, "%s: write error in pass2\n", progname); quit(1); } } + /* skip leftover input */ + while (yread < yres) { + if (freadscan(scanin[0], xres, in) < 0) + break; + yread++; + } + scan2flush(); /* flush output */ } scan2init() /* prepare scanline arrays */ { - double e; + COLOR ctmp; + double d; register int i; - if (rad <= 0.0) { - xrad = xres/ncols/2 + 1; - yrad = yres/nrows/2 + 1; - } else { + xbrad = xres/ncols/2 + 1; + ybrad = yres/nrows/2 + 1; + if (rad > FTINY) { if (nrows >= yres && ncols >= xres) rad *= (y_r + x_c)/2.0; - xrad = CHECKRAD*rad/x_c + 1; - yrad = CHECKRAD*rad/y_r + 1; - + if (thresh > FTINY) { + xrad = CHECKRAD*THRESHRAD*rad/x_c + xbrad; + yrad = CHECKRAD*THRESHRAD*rad/y_r + ybrad; + orad = CHECKRAD*THRESHRAD*rad + 1; + obarsize = 2*orad + 1; + } else { + xrad = CHECKRAD*rad/x_c + 1; + yrad = CHECKRAD*rad/y_r + 1; + } initmask(); /* initialize filter table */ + } else { + xrad = xbrad; + yrad = ybrad; } - 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)); @@ -336,16 +450,84 @@ scan2init() /* prepare scanline arrays */ quit(1); } } - scanout = (COLOR *)malloc(ncols*sizeof(COLOR)); - if (scanout == NULL) { - fprintf(stderr, "%s: out of memory\n", progname); - quit(1); + if (obarsize > 0) { + scoutbar = (COLOR **)malloc(obarsize*sizeof(COLOR *)); + greybar = (float **)malloc(obarsize*sizeof(float *)); + for (i = 0; i < obarsize; i++) { + scoutbar[i] = (COLOR *)malloc(ncols*sizeof(COLOR)); + greybar[i] = (float *)malloc(ncols*sizeof(float)); + if (scoutbar[i] == NULL | greybar[i] == NULL) { + fprintf(stderr, "%s: out of memory\n", + progname); + quit(1); + } + } + } else { + scanout = (COLOR *)malloc(ncols*sizeof(COLOR)); + if (scanout == NULL) { + fprintf(stderr, "%s: out of memory\n", progname); + quit(1); + } } - e = bright(exposure); - if (e < 1-1e-7 || e > 1+1e-7) /* record exposure */ - printf("EXPOSURE=%e\n", e); + /* 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 (!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"); - printf("-Y %d +X %d\n", nrows, ncols); /* write picture size */ + /* write out resolution */ + fputresolu(order, ncols, nrows, stdout); +} + + +scan2sync(r) /* synchronize grey averages and output scan */ +int r; +{ + static int nextrow = 0; + COLOR ctmp; + int ybot; + register int c; + /* average input scanlines */ + while (nextrow < r+orad && nextrow < nrows) { + ybot = (long)nextrow*yres/nrows; + for (c = 0; c < ncols; c++) { + dobox(ctmp, (int)((long)c*xres/ncols),ybot, c,nextrow); + greybar[nextrow%obarsize][c] = bright(ctmp); + } + /* and zero output scanline */ + bzero((char *)scoutbar[nextrow%obarsize], ncols*sizeof(COLOR)); + nextrow++; + } + /* point to top scanline for output */ + if (r-orad >= 0) + scanout = scoutbar[(r-orad)%obarsize]; + else + scanout = NULL; +} + + +scan2flush() /* flush output buffer */ +{ + register int r; + + for (r = nrows-orad; r < nrows; r++) + if (fwritescan(scoutbar[r%obarsize], ncols, stdout) < 0) + break; + if (fflush(stdout) < 0) { + fprintf(stderr, "%s: write error at end of pass2\n", progname); + exit(1); + } }