--- ray/src/px/pvalue.c 1997/01/08 08:00:23 2.11 +++ 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) */ @@ -43,6 +44,8 @@ int header = 1; /* do header? */ long skipbytes = 0; /* skip bytes in input? */ +int interleave = 1; /* file is interleaved? */ + int resolution = 1; /* put/get resolution string? */ int original = 0; /* convert to original values? */ @@ -63,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; @@ -119,6 +138,9 @@ char **argv; case 'r': /* reverse conversion */ reverse = argv[i][0] == '-'; break; + case 'n': /* non-interleaved RGB */ + interleave = argv[i][0] == '+'; + break; case 'b': /* brightness values */ putprim = argv[i][0] == '-' ? BRIGHT : ALL; break; @@ -147,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'; @@ -165,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: @@ -192,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; @@ -205,8 +237,6 @@ unkopt: progname, argv[i]); quit(1); } - if (skipbytes && fseek(fin, skipbytes, 0)) - goto seekerr; if (reverse && !brightonly && i == argc-3) { if ((fin2 = fopen(argv[i+1], "r")) == NULL) { fprintf(stderr, "%s: can't open file \"%s\"\n", @@ -218,19 +248,26 @@ unkopt: progname, argv[i+2]); quit(1); } - if (skipbytes && (fseek(fin2, skipbytes, 0) || - fseek(fin3, skipbytes, 0))) - goto seekerr; + interleave = -1; } else if (i != argc-1) fin = NULL; + if (reverse && !brightonly && !interleave) { + fin2 = fopen(argv[i], "r"); + fin3 = fopen(argv[i], "r"); + } + if (skipbytes && (fseek(fin, skipbytes, 0) || (fin2 != NULL && + (fseek(fin2, skipbytes, 0) || + fseek(fin3, skipbytes, 0))))) { + fprintf(stderr, "%s: cannot skip %ld bytes on input\n", + progname, skipbytes); + quit(1); + } } if (fin == NULL) { fprintf(stderr, "%s: bad # file arguments\n", progname); quit(1); } - set_io(); - if (reverse) { #ifdef MSDOS setmode(fileno(stdout), O_BINARY); @@ -259,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", @@ -288,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); } @@ -309,13 +347,10 @@ unkopt: } quit(0); -seekerr: - fprintf(stderr, "%s: cannot skip %ld bytes on input\n", - progname, skipbytes); - quit(1); } +int checkhead(line) /* deal with line from header */ char *line; { @@ -323,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++; @@ -337,6 +381,7 @@ char *line; doexposure++; } else if (header) fputs(line, stdout); + return(0); } @@ -346,6 +391,8 @@ pixtoval() /* convert picture to values */ int dogamma; COLOR lastc; FLOAT hv[2]; + int startprim, endprim; + long startpos; int y; register int x; @@ -355,42 +402,58 @@ pixtoval() /* convert picture to values */ quit(1); } dogamma = gamcor < .95 || gamcor > 1.05; - setcolor(lastc, 0.0, 0.0, 0.0); - for (y = 0; y < numscans(&picres); y++) { - if (freadscan(scanln, scanlen(&picres), fin) < 0) { - fprintf(stderr, "%s: read error\n", progname); + if (putprim == ALL && !interleave) { + startprim = RED; endprim = BLU; + startpos = ftell(fin); + } else { + startprim = putprim; endprim = putprim; + } + for (putprim = startprim; putprim <= endprim; putprim++) { + if (putprim != startprim && fseek(fin, startpos, 0)) { + fprintf(stderr, "%s: seek error on input file\n", + progname); quit(1); } - for (x = 0; x < scanlen(&picres); x++) { - if (uniq) - if ( colval(scanln[x],RED) == - colval(lastc,RED) && - colval(scanln[x],GRN) == - colval(lastc,GRN) && - colval(scanln[x],BLU) == - colval(lastc,BLU) ) - continue; - else - copycolor(lastc, scanln[x]); - if (doexposure) - multcolor(scanln[x], exposure); - if (dogamma) - setcolor(scanln[x], - pow(colval(scanln[x],RED), 1.0/gamcor), - pow(colval(scanln[x],GRN), 1.0/gamcor), - pow(colval(scanln[x],BLU), 1.0/gamcor)); - if (!dataonly) { - pix2loc(hv, &picres, x, y); - printf("%7d %7d ", (int)(hv[0]*picres.xr), - (int)(hv[1]*picres.yr)); - } - if ((*putval)(scanln[x]) < 0) { - fprintf(stderr, "%s: write error\n", progname); + set_io(); + setcolor(lastc, 0.0, 0.0, 0.0); + for (y = 0; y < numscans(&picres); y++) { + if (freadscan(scanln, scanlen(&picres), fin) < 0) { + fprintf(stderr, "%s: read error\n", progname); quit(1); } + for (x = 0; x < scanlen(&picres); x++) { + if (uniq) + if ( colval(scanln[x],RED) == + colval(lastc,RED) && + colval(scanln[x],GRN) == + colval(lastc,GRN) && + colval(scanln[x],BLU) == + colval(lastc,BLU) ) + continue; + else + copycolor(lastc, scanln[x]); + if (doexposure) + multcolor(scanln[x], exposure); + if (dogamma) + setcolor(scanln[x], + pow(colval(scanln[x],RED), 1.0/gamcor), + pow(colval(scanln[x],GRN), 1.0/gamcor), + pow(colval(scanln[x],BLU), 1.0/gamcor)); + if (!dataonly) { + pix2loc(hv, &picres, x, y); + printf("%7d %7d ", + (int)(hv[0]*picres.xr), + (int)(hv[1]*picres.yr)); + } + if ((*putval)(scanln[x]) < 0) { + fprintf(stderr, "%s: write error\n", + progname); + quit(1); + } + } } } - free((char *)scanln); + free((void *)scanln); } @@ -407,6 +470,7 @@ valtopix() /* convert values to a pixel file */ quit(1); } dogamma = gamcor < .95 || gamcor > 1.05; + set_io(); for (y = 0; y < numscans(&picres); y++) { for (x = 0; x < scanlen(&picres); x++) { if (!dataonly) { @@ -433,10 +497,11 @@ valtopix() /* convert values to a pixel file */ quit(1); } } - free((char *)scanln); + free((void *)scanln); } +void quit(code) int code; { @@ -541,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; { @@ -605,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; { @@ -660,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.; @@ -675,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); } @@ -689,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); @@ -701,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); @@ -711,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); } @@ -723,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); @@ -731,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; { @@ -776,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.; @@ -787,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) { @@ -800,6 +945,12 @@ set_io() /* set put and get functions */ } else { getval = getcascii; putval = putcascii; + if (reverse && !interleave) { + fprintf(stderr, + "%s: ASCII input files must be interleaved\n", + progname); + quit(1); + } } return; case 'f': /* binary float */ @@ -812,6 +963,16 @@ set_io() /* set put and get functions */ } else { getval = getcfloat; putval = putcfloat; + if (reverse && !interleave) { + if (fin2 == NULL) + goto namerr; + if (fseek(fin2, + (long)sizeof(float)*picres.xr*picres.yr, 1)) + goto seekerr; + if (fseek(fin3, + (long)sizeof(float)*2*picres.xr*picres.yr, 1)) + goto seekerr; + } } return; case 'd': /* binary double */ @@ -824,6 +985,16 @@ set_io() /* set put and get functions */ } else { getval = getcdouble; putval = putcdouble; + if (reverse && !interleave) { + if (fin2 == NULL) + goto namerr; + if (fseek(fin2, + (long)sizeof(double)*picres.xr*picres.yr, 1)) + goto seekerr; + if (fseek(fin3, + (long)sizeof(double)*2*picres.xr*picres.yr, 1)) + goto seekerr; + } } return; case 'i': /* integer */ @@ -836,6 +1007,12 @@ set_io() /* set put and get functions */ } else { getval = getcint; putval = putcint; + if (reverse && !interleave) { + fprintf(stderr, + "%s: integer input files must be interleaved\n", + progname); + quit(1); + } } return; case 'b': /* byte */ @@ -848,7 +1025,50 @@ set_io() /* set put and get functions */ } else { getval = getcbyte; putval = putcbyte; + if (reverse && !interleave) { + if (fin2 == NULL) + goto namerr; + if (fseek(fin2, + (long)sizeof(BYTE)*picres.xr*picres.yr, 1)) + 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; + } + } + return; } +badopt: + fprintf(stderr, "%s: botched file type\n", progname); + quit(1); +namerr: + fprintf(stderr, "%s: non-interleaved file(s) must be named\n", + progname); + quit(1); +seekerr: + fprintf(stderr, "%s: cannot seek on interleaved input file\n", + progname); + quit(1); }