--- ray/src/px/pcomb.c 1996/08/30 17:39:39 2.17 +++ ray/src/px/pcomb.c 2004/08/31 18:52:27 2.34 @@ -1,27 +1,21 @@ -/* Copyright (c) 1992 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: pcomb.c,v 2.34 2004/08/31 18:52:27 greg Exp $"; #endif - /* * Combine picture files according to calcomp functions. * * 1/4/89 */ +#include "platform.h" #include "standard.h" - +#include "rtprocess.h" #include "color.h" - -#include "resolu.h" - #include "calcomp.h" - #include "view.h" #define MAXINP 32 /* maximum number of input files */ -#define WINSIZ 17 /* scanline window size */ +#define WINSIZ 64 /* scanline window size */ #define MIDSCN ((WINSIZ-1)/2+1) struct { @@ -39,6 +33,7 @@ int nfiles; /* number of input files */ char ourfmt[LPICFMT+1] = PICFMT; /* input picture format */ +char StandardInput[] = ""; char Command[] = ""; char vcolin[3][4] = {"ri", "gi", "bi"}; char vcolout[3][4] = {"ro", "go", "bo"}; @@ -46,12 +41,14 @@ char vbrtin[] = "li"; char vbrtout[] = "lo"; char vcolexp[3][4] = {"re", "ge", "be"}; char vbrtexp[] = "le"; +char vpixaspect[] = "pa"; -char vray[6][4] = {"Ox", "Oy", "Oz", "Dx", "Dy", "Dz"}; +char vray[7][4] = {"Ox", "Oy", "Oz", "Dx", "Dy", "Dz", "T"}; char vpsize[] = "S"; char vnfiles[] = "nfiles"; +char vwhteff[] = "WE"; char vxmax[] = "xmax"; char vymax[] = "ymax"; char vxres[] = "xres"; @@ -74,24 +71,33 @@ char *progname; /* global argv[0] */ int wrongformat = 0; int gotview; -FILE *popen(); -extern char *emalloc(); +static gethfunc tabputs; +static void checkfile(void); +static double rgb_bright(COLOR clr); +static double xyz_bright(COLOR clr); +static void init(void); +static void combine(void); +static void advance(void); +static double l_expos(char *nam); +static double l_pixaspect(char *nm); +static double l_colin(char *nam); +static double l_ray(char *nam); +static double l_psize(char *nm); -main(argc, argv) -int argc; -char *argv[]; +int +main( + int argc, + char *argv[] +) { int original; double f; - int a, i; -#ifdef MSDOS - extern int _fmode; - _fmode = O_BINARY; - setmode(fileno(stdin), O_BINARY); - setmode(fileno(stdout), O_BINARY); -#endif + int a; + SET_DEFAULT_BINARY(); + SET_FILE_BINARY(stdin); + SET_FILE_BINARY(stdout); progname = argv[0]; /* scan options */ for (a = 1; a < argc; a++) { @@ -112,11 +118,12 @@ char *argv[]; break; } newheader("RADIANCE", stdout); /* start header */ + fputnow(stdout); /* process files */ for (nfiles = 0; nfiles < MAXINP; nfiles++) { setcolor(input[nfiles].coef, 1.0, 1.0, 1.0); setcolor(input[nfiles].expos, 1.0, 1.0, 1.0); - copystruct(&input[nfiles].vw, &stdview); + input[nfiles].vw = stdview; input[nfiles].pa = 1.0; } nfiles = 0; @@ -130,7 +137,7 @@ char *argv[]; if (argv[a][0] == '-') switch (argv[a][1]) { case '\0': - input[nfiles].name = ""; + input[nfiles].name = StandardInput; input[nfiles].fp = stdin; break; case 'o': @@ -169,6 +176,7 @@ char *argv[]; colval(input[nfiles].expos,GRN); colval(input[nfiles].coef,BLU) /= colval(input[nfiles].expos,BLU); + setcolor(input[nfiles].expos, 1.0, 1.0, 1.0); } nfiles++; original = 0; @@ -222,25 +230,29 @@ usage: eputs( " [-w][-x xr][-y yr][-e expr][-f file] [ [-o][-s f][-c r g b] pic ..]\n"); quit(1); + return 1; /* pro forma return */ } -tputs(s) /* put out string preceded by a tab */ -char *s; +static int +tabputs( /* put out string preceded by a tab */ + char *s, + void *p +) { char fmt[32]; double d; COLOR ctmp; if (isheadid(s)) /* header id */ - return; /* don't echo */ + return(0); /* don't echo */ if (formatval(fmt, s)) { /* check format */ if (globmatch(ourfmt, fmt)) { wrongformat = 0; strcpy(ourfmt, fmt); } else - wrongformat = 1; - return; /* don't echo */ + wrongformat = globmatch(PICFMT, fmt) ? 1 : -1; + return(0); /* don't echo */ } if (isexpos(s)) { /* exposure */ d = exposval(s); @@ -248,29 +260,34 @@ char *s; } else if (iscolcor(s)) { /* color correction */ colcorval(ctmp, s); multcolor(input[nfiles].expos, ctmp); - } else if (isaspect(s)) { + } else if (isaspect(s)) input[nfiles].pa *= aspectval(s); - } else if (isview(s) && sscanview(&input[nfiles].vw, s) > 0) + else if (isview(s) && sscanview(&input[nfiles].vw, s) > 0) gotview++; /* echo line */ putchar('\t'); - fputs(s, stdout); + return(fputs(s, stdout)); } -checkfile() /* ready a file */ +static void +checkfile(void) /* ready a file */ { register int i; /* process header */ gotview = 0; fputs(input[nfiles].name, stdout); fputs(":\n", stdout); - getheader(input[nfiles].fp, tputs, NULL); - if (wrongformat) { + getheader(input[nfiles].fp, tabputs, NULL); + if (wrongformat < 0) { eputs(input[nfiles].name); - eputs(": not in Radiance picture format\n"); + eputs(": not a Radiance picture\n"); quit(1); } + if (wrongformat > 0) { + wputs(input[nfiles].name); + wputs(": warning -- incompatible picture format\n"); + } if (!gotview || setview(&input[nfiles].vw) != NULL) input[nfiles].vw.type = 0; if (!fgetsresolu(&input[nfiles].rs, input[nfiles].fp)) { @@ -293,17 +310,19 @@ checkfile() /* ready a file */ } -double -rgb_bright(clr) -COLOR clr; +static double +rgb_bright( + COLOR clr +) { return(bright(clr)); } -double -xyz_bright(clr) -COLOR clr; +static double +xyz_bright( + COLOR clr +) { return(clr[CIEY]); } @@ -312,11 +331,12 @@ COLOR clr; double (*ourbright)() = rgb_bright; -init() /* perform final setup */ +static void +init(void) /* perform final setup */ { - double l_colin(), l_expos(), l_ray(), l_psize(); register int i; /* define constants */ + varset("PI", ':', PI); varset(vnfiles, ':', (double)nfiles); varset(vxmax, ':', (double)xmax); varset(vymax, ':', (double)ymax); @@ -327,16 +347,21 @@ init() /* perform final setup */ } funset(vbrtexp, 1, ':', l_expos); funset(vbrtin, 1, '=', l_colin); - for (i = 0; i < 6; i++) + funset(vpixaspect, 1, ':', l_pixaspect); + for (i = 0; i < 7; i++) funset(vray[i], 1, '=', l_ray); funset(vpsize, 1, '=', l_psize); /* set brightness function */ - if (!strcmp(ourfmt, CIEFMT)) + if (!strcmp(ourfmt, CIEFMT)) { + varset(vwhteff, ':', 1.0); ourbright = xyz_bright; + } else + varset(vwhteff, ':', WHTEFFICACY); } -combine() /* combine pictures */ +static void +combine(void) /* combine pictures */ { EPNODE *coldef[3], *brtdef; COLOR *scanout; @@ -390,11 +415,12 @@ combine() /* combine pictures */ quit(1); } } - efree(scanout); + efree((char *)scanout); } -advance() /* read in data for next scanline */ +static void +advance(void) /* read in data for next scanline */ { int ytarget; register COLOR *st; @@ -422,9 +448,10 @@ advance() /* read in data for next scanline */ } -double -l_expos(nam) /* return picture exposure */ -register char *nam; +static double +l_expos( /* return picture exposure */ + register char *nam +) { register int fn, n; @@ -439,21 +466,32 @@ register char *nam; return(colval(input[fn].expos,n)); eputs("Bad call to l_expos()!\n"); quit(1); + return 1; /* pro forma return */ } -double -l_colin(nam) /* return color value for picture */ -register char *nam; +static double +l_pixaspect(char *nm) /* return pixel aspect ratio */ { + register int fn; + + fn = argument(1) - .5; + if (fn < 0 || fn >= nfiles) + return(1.0); + return(input[fn].pa); +} + + +static double +l_colin( /* return color value for picture */ + register char *nam +) +{ int fn; register int n, xoff, yoff; double d; - d = argument(1); - if (d > -.5 && d < .5) - return((double)nfiles); - fn = d - .5; + fn = argument(1) - .5; if (fn < 0 || fn >= nfiles) { errno = EDOM; return(0.0); @@ -496,115 +534,114 @@ register char *nam; return(colval(input[fn].scan[MIDSCN+yoff][xscan+xoff],n)); eputs("Bad call to l_colin()!\n"); quit(1); + return 1; /* pro forma return */ } -double -l_ray(nam) /* return ray origin or direction */ -register char *nam; +static double +l_ray( /* return ray origin or direction */ + register char *nam +) { static unsigned long ltick[MAXINP]; static FVECT lorg[MAXINP], ldir[MAXINP]; - FLOAT loc[2]; - double d; + static double ldist[MAXINP]; + RREAL loc[2]; int fn; register int i; - d = argument(1); - if (d > -.5 && d < .5) - return((double)nfiles); - fn = d - .5; + fn = argument(1) - .5; if (fn < 0 || fn >= nfiles) { errno = EDOM; return(0.0); } - if (ltick[fn] < eclock) { /* need to compute? */ + if (ltick[fn] != eclock) { /* need to compute? */ lorg[fn][0] = lorg[fn][1] = lorg[fn][2] = 0.0; ldir[fn][0] = ldir[fn][1] = ldir[fn][2] = 0.0; + ldist[fn] = -1.0; if (input[fn].vw.type == 0) errno = EDOM; else { pix2loc(loc, &input[fn].rs, xscan, ymax-1-yscan); - if (viewray(lorg[fn], ldir[fn], - &input[fn].vw, loc[0], loc[1]) < 0) - errno = ERANGE; - ltick[fn] = eclock; + ldist[fn] = viewray(lorg[fn], ldir[fn], + &input[fn].vw, loc[0], loc[1]); } + ltick[fn] = eclock; } - i = 6; + if (nam == vray[i=6]) + return(ldist[fn]); while (i--) if (nam == vray[i]) return(i < 3 ? lorg[fn][i] : ldir[fn][i-3]); eputs("Bad call to l_ray()!\n"); quit(1); + return 1; /* pro forma return */ } -double -l_psize() /* compute pixel size in steradians */ +static double +l_psize(char *nm) /* compute pixel size in steradians */ { static unsigned long ltick[MAXINP]; static double psize[MAXINP]; - FVECT dir0, org1, dir1; - FLOAT loc[2]; + FVECT dir0, org, dirx, diry; + RREAL locx[2], locy[2]; double d; int fn; + register int i; d = argument(1); - if (d > -.5 && d < .5) - return((double)nfiles); - fn = d - .5; - if (fn < 0 || fn >= nfiles) { + if (d < .5 || d >= nfiles+.5) { errno = EDOM; return(0.0); } - if (ltick[fn] < eclock) /* need to compute? */ - if (input[fn].vw.type == 0 || input[fn].vw.type == VT_PAR) + fn = d - .5; + if (ltick[fn] != eclock) { /* need to compute? */ + psize[fn] = 0.0; + if (input[fn].vw.type == 0) errno = EDOM; - else { - errno = 0; - dir0[0] = funvalue(vray[3], 1, &d); - if (errno) - return(0.0); - dir0[1] = funvalue(vray[4], 1, &d); - if (errno) - return(0.0); - dir0[2] = funvalue(vray[5], 1, &d); - if (errno) - return(0.0); - pix2loc(loc, &input[fn].rs, xscan+1, ymax-yscan); - psize[fn] = 0.0; - if (viewray(org1, dir1, - &input[fn].vw, loc[0], loc[1]) < 0) - errno = ERANGE; - else { + else if (input[fn].vw.type != VT_PAR && + funvalue(vray[6], 1, &d) >= 0) { + for (i = 0; i < 3; i++) + dir0[i] = funvalue(vray[3+i], 1, &d); + pix2loc(locx, &input[fn].rs, xscan+1, ymax-1-yscan); + pix2loc(locy, &input[fn].rs, xscan, ymax-yscan); + if (viewray(org, dirx, &input[fn].vw, + locx[0], locx[1]) >= 0 && + viewray(org, diry, &input[fn].vw, + locy[0], locy[1]) >= 0) { /* approximate solid angle */ - psize[fn] = dist2(dir0, dir1) * input[fn].pa / - (1.0 + input[fn].pa*input[fn].pa); - ltick[fn] = eclock; + for (i = 0; i < 3; i++) { + dirx[i] -= dir0[i]; + diry[i] -= dir0[i]; + } + fcross(dir0, dirx, diry); + psize[fn] = sqrt(DOT(dir0,dir0)); } } + ltick[fn] = eclock; + } return(psize[fn]); } -wputs(msg) -char *msg; +extern void +wputs(char *msg) { if (!nowarn) eputs(msg); } -eputs(msg) -char *msg; +extern void +eputs(char *msg) { fputs(msg, stderr); } -quit(code) /* exit gracefully */ -int code; +extern void +quit(int code) /* exit gracefully */ { register int i; /* close input files */