--- ray/src/px/pvalue.c 1998/10/27 09:08:27 2.13 +++ ray/src/px/pvalue.c 2003/02/25 16:22:05 2.15 @@ -1,9 +1,6 @@ -/* Copyright (c) 1992 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: pvalue.c,v 2.15 2003/02/25 16:22:05 greg Exp $"; #endif - /* * pvalue.c - program to print pixel values. * @@ -14,8 +11,12 @@ static char SCCSid[] = "$SunId$ LBL"; #include "color.h" +#include + #include "resolu.h" +typedef unsigned short uint16; /* sizeof (uint16) must == 2 */ + #define min(a,b) ((a)<(b)?(a):(b)) /* what to put out (also RED, GRN, BLU) */ @@ -65,7 +66,23 @@ FILE *fin2 = NULL, *fin3 = NULL; /* for other color c int (*getval)(), (*putval)(); +double +rgb_bright(clr) +COLOR clr; +{ + return(bright(clr)); +} +double +xyz_bright(clr) +COLOR clr; +{ + return(clr[CIEY]); +} + +double (*mybright)() = &rgb_bright; + + main(argc, argv) int argc; char **argv; @@ -152,6 +169,11 @@ char **argv; format = 'b'; fmtid = "byte"; break; + case 'w': /* 16-bit */ + dataonly = 1; + format = 'w'; + fmtid = "16-bit"; + break; case 'f': /* float */ dataonly = 1; format = 'f'; @@ -170,16 +192,16 @@ char **argv; case 'X': /* x resolution */ resolution = 0; if (argv[i][0] == '-') - picres.or |= XDECR; + picres.rt |= XDECR; picres.xr = atoi(argv[++i]); break; case 'y': /* y resolution */ case 'Y': /* y resolution */ resolution = 0; if (argv[i][0] == '-') - picres.or |= YDECR; + picres.rt |= YDECR; if (picres.xr == 0) - picres.or |= YMAJOR; + picres.rt |= YMAJOR; picres.yr = atoi(argv[++i]); break; default: @@ -197,6 +219,11 @@ unkopt: fmtid = "8-bit_grey"; else fmtid = "24-bit_rgb"; + if (dataonly && format == 'w') + if (brightonly) + fmtid = "16-bit_grey"; + else + fmtid = "48-bit_rgb"; /* assign reverse ordering */ rord[ord[0]] = 0; rord[ord[1]] = 1; @@ -269,11 +296,11 @@ unkopt: if (resolution && fin2 != NULL) { RESOLU pres2; if (!fgetsresolu(&pres2, fin2) || - pres2.or != picres.or || + pres2.rt != picres.rt || pres2.xr != picres.xr || pres2.yr != picres.yr || !fgetsresolu(&pres2, fin3) || - pres2.or != picres.or || + pres2.rt != picres.rt || pres2.xr != picres.xr || pres2.yr != picres.yr) { fprintf(stderr, "%s: resolution mismatch\n", @@ -298,7 +325,8 @@ unkopt: /* get header */ getheader(fin, checkhead, NULL); if (wrongformat) { - fprintf(stderr, "%s: input not a Radiance picture\n", + fprintf(stderr, + "%s: input not a Radiance RGBE picture\n", progname); quit(1); } @@ -330,9 +358,18 @@ char *line; double d; COLOR ctmp; - if (formatval(fmt, line)) - wrongformat = strcmp(fmt, COLRFMT); - else if (original && isexpos(line)) { + if (formatval(fmt, line)) { + if (!strcmp(fmt, CIEFMT)) { + mybright = &xyz_bright; + if (original) { + scalecolor(exposure, 1./WHTEFFICACY); + doexposure++; + } + } else if (!strcmp(fmt, COLRFMT)) + mybright = &rgb_bright; + else + wrongformat++; + } else if (original && isexpos(line)) { d = 1.0/exposval(line); scalecolor(exposure, d); doexposure++; @@ -416,7 +453,7 @@ pixtoval() /* convert picture to values */ } } } - free((char *)scanln); + free((void *)scanln); } @@ -460,10 +497,11 @@ valtopix() /* convert values to a pixel file */ quit(1); } } - free((char *)scanln); + free((void *)scanln); } +void quit(code) int code; { @@ -568,6 +606,26 @@ COLOR col; } +getcword(col) /* get a 16-bit color value from stream(s) */ +COLOR col; +{ + uint16 vw[3]; + + if (fin2 == NULL) { + if (fread((char *)vw, sizeof(uint16), 3, fin) != 3) + return(-1); + } else { + if (fread((char *)vw, sizeof(uint16), 1, fin) != 1 || + fread((char *)(vw+1), sizeof(uint16), 1, fin2) != 1 || + fread((char *)(vw+2), sizeof(uint16), 1, fin3) != 1) + return(-1); + } + setcolor(col, (vw[rord[RED]]+.5)/65536., + (vw[rord[GRN]]+.5)/65536., (vw[rord[BLU]]+.5)/65536.); + return(0); +} + + getbascii(col) /* get an ascii brightness value from fin */ COLOR col; { @@ -632,6 +690,20 @@ COLOR col; } +getbword(col) /* get a 16-bit brightness value from fin */ +COLOR col; +{ + uint16 vw; + double d; + + if (fread((char *)&vw, sizeof(uint16), 1, fin) != 1) + return(-1); + d = (vw+.5)/65536.; + setcolor(col, d, d, d); + return(0); +} + + putcascii(col) /* put an ascii color to stdout */ COLOR col; { @@ -687,7 +759,7 @@ COLOR col; putcbyte(col) /* put a byte color to stdout */ COLOR col; { - register int i; + long i; BYTE vb[3]; i = colval(col,ord[0])*256.; @@ -702,10 +774,28 @@ COLOR col; } +putcword(col) /* put a 16-bit color to stdout */ +COLOR col; +{ + long i; + uint16 vw[3]; + + i = colval(col,ord[0])*65536.; + vw[0] = min(i,65535); + i = colval(col,ord[1])*65536.; + vw[1] = min(i,65535); + i = colval(col,ord[2])*65536.; + vw[2] = min(i,65535); + fwrite((char *)vw, sizeof(uint16), 3, stdout); + + return(ferror(stdout) ? -1 : 0); +} + + putbascii(col) /* put an ascii brightness to stdout */ COLOR col; { - fprintf(stdout, "%15.3e\n", bright(col)); + fprintf(stdout, "%15.3e\n", (*mybright)(col)); return(ferror(stdout) ? -1 : 0); } @@ -716,7 +806,7 @@ COLOR col; { float vf; - vf = bright(col); + vf = (*mybright)(col); fwrite((char *)&vf, sizeof(float), 1, stdout); return(ferror(stdout) ? -1 : 0); @@ -728,7 +818,7 @@ COLOR col; { double vd; - vd = bright(col); + vd = (*mybright)(col); fwrite((char *)&vd, sizeof(double), 1, stdout); return(ferror(stdout) ? -1 : 0); @@ -738,7 +828,7 @@ COLOR col; putbint(col) /* put an int brightness to stdout */ COLOR col; { - fprintf(stdout, "%d\n", (int)(bright(col)*256.)); + fprintf(stdout, "%d\n", (int)((*mybright)(col)*256.)); return(ferror(stdout) ? -1 : 0); } @@ -750,7 +840,7 @@ COLOR col; register int i; BYTE vb; - i = bright(col)*256.; + i = (*mybright)(col)*256.; vb = min(i,255); fwrite((char *)&vb, sizeof(BYTE), 1, stdout); @@ -758,6 +848,20 @@ COLOR col; } +putbword(col) /* put a 16-bit brightness to stdout */ +COLOR col; +{ + long i; + uint16 vw; + + i = (*mybright)(col)*65536.; + vw = min(i,65535); + fwrite((char *)&vw, sizeof(uint16), 1, stdout); + + return(ferror(stdout) ? -1 : 0); +} + + putpascii(col) /* put an ascii primary to stdout */ COLOR col; { @@ -803,7 +907,7 @@ COLOR col; putpbyte(col) /* put a byte primary to stdout */ COLOR col; { - register int i; + long i; BYTE vb; i = colval(col,putprim)*256.; @@ -814,6 +918,20 @@ COLOR col; } +putpword(col) /* put a 16-bit primary to stdout */ +COLOR col; +{ + long i; + uint16 vw; + + i = colval(col,putprim)*65536.; + vw = min(i,65535); + fwrite((char *)&vw, sizeof(uint16), 1, stdout); + + return(ferror(stdout) ? -1 : 0); +} + + set_io() /* set put and get functions */ { switch (format) { @@ -915,6 +1033,28 @@ set_io() /* set put and get functions */ goto seekerr; if (fseek(fin3, (long)sizeof(BYTE)*2*picres.xr*picres.yr, 1)) + goto seekerr; + } + } + return; + case 'w': /* 16-bit */ + if (putprim == BRIGHT) { + getval = getbword; + putval = putbword; + } else if (putprim != ALL) { + getval = getbword; + putval = putpword; + } else { + getval = getcword; + putval = putcword; + if (reverse && !interleave) { + if (fin2 == NULL) + goto namerr; + if (fseek(fin2, + (long)sizeof(uint16)*picres.xr*picres.yr, 1)) + goto seekerr; + if (fseek(fin3, + (long)sizeof(uint16)*2*picres.xr*picres.yr, 1)) goto seekerr; } }