--- ray/src/px/pvalue.c 1991/11/11 14:01:37 1.8 +++ ray/src/px/pvalue.c 1997/01/08 08:00:23 2.11 @@ -1,4 +1,4 @@ -/* Copyright (c) 1991 Regents of the University of California */ +/* Copyright (c) 1992 Regents of the University of California */ #ifndef lint static char SCCSid[] = "$SunId$ LBL"; @@ -16,37 +16,51 @@ static char SCCSid[] = "$SunId$ LBL"; #include "resolu.h" -#define min(a,b) ((a)<(b)?(a):(b)) +#define min(a,b) ((a)<(b)?(a):(b)) -RESOLU picres; /* resolution of picture */ + /* what to put out (also RED, GRN, BLU) */ +#define ALL 3 +#define BRIGHT 4 +#define brightonly (putprim==BRIGHT) + +RESOLU picres; /* resolution of picture */ + int uniq = 0; /* print only unique values? */ -int original = 0; /* convert back to original values? */ +int doexposure = 0; /* exposure change? (>100 to print) */ int dataonly = 0; /* data only format? */ -int brightonly = 0; /* only brightness values? */ +int putprim = ALL; /* what to put out */ int reverse = 0; /* reverse conversion? */ int format = 'a'; /* input/output format */ char *fmtid = "ascii"; /* format identifier for header */ -int header = 1; /* do header */ +int header = 1; /* do header? */ +long skipbytes = 0; /* skip bytes in input? */ + +int resolution = 1; /* put/get resolution string? */ + +int original = 0; /* convert to original values? */ + int wrongformat = 0; /* wrong input format? */ -double gamcor = 1.0; /* gamma correction */ +double gamcor = 1.0; /* gamma correction */ +int ord[3] = {RED, GRN, BLU}; /* RGB ordering */ +int rord[4]; /* reverse ordering */ + COLOR exposure = WHTCOLOR; char *progname; FILE *fin; +FILE *fin2 = NULL, *fin3 = NULL; /* for other color channels */ -extern double atof(), pow(); - int (*getval)(), (*putval)(); @@ -55,6 +69,8 @@ int argc; char **argv; { extern int checkhead(); + extern long atol(); + double d, expval = 1.0; int i; progname = argv[0]; @@ -65,6 +81,12 @@ char **argv; case 'h': /* header */ header = argv[i][0] == '+'; break; + case 'H': /* resolution string */ + resolution = argv[i][0] == '+'; + break; + case 's': /* skip bytes in header */ + skipbytes = atol(argv[++i]); + break; case 'u': /* unique values */ uniq = argv[i][0] == '-'; break; @@ -72,16 +94,42 @@ char **argv; original = argv[i][0] == '-'; break; case 'g': /* gamma correction */ - gamcor = atof(argv[++i]); + gamcor = atof(argv[i+1]); if (argv[i][0] == '+') gamcor = 1.0/gamcor; + i++; break; + case 'e': /* exposure correction */ + d = atof(argv[i+1]); + if (argv[i+1][0] == '-' || argv[i+1][0] == '+') + d = pow(2.0, d); + if (argv[i][0] == '-') + expval *= d; + scalecolor(exposure, d); + doexposure++; + i++; + break; + case 'R': /* reverse byte sequence */ + if (argv[i][0] == '-') { + ord[0]=BLU; ord[1]=GRN; ord[2]=RED; + } else { + ord[0]=RED; ord[1]=GRN; ord[2]=BLU; + } + break; case 'r': /* reverse conversion */ reverse = argv[i][0] == '-'; break; case 'b': /* brightness values */ - brightonly = argv[i][0] == '-'; + putprim = argv[i][0] == '-' ? BRIGHT : ALL; break; + case 'p': /* put primary */ + switch (argv[i][2]) { + case 'r': case 'R': putprim = RED; break; + case 'g': case 'G': putprim = GRN; break; + case 'b': case 'B': putprim = BLU; break; + default: goto unkopt; + } + break; case 'd': /* data only (no indices) */ dataonly = argv[i][0] == '-'; switch (argv[i][2]) { @@ -114,11 +162,15 @@ char **argv; } break; case 'x': /* x resolution */ + case 'X': /* x resolution */ + resolution = 0; if (argv[i][0] == '-') picres.or |= XDECR; picres.xr = atoi(argv[++i]); break; case 'y': /* y resolution */ + case 'Y': /* y resolution */ + resolution = 0; if (argv[i][0] == '-') picres.or |= YDECR; if (picres.xr == 0) @@ -140,16 +192,39 @@ unkopt: fmtid = "8-bit_grey"; else fmtid = "24-bit_rgb"; - + /* assign reverse ordering */ + rord[ord[0]] = 0; + rord[ord[1]] = 1; + rord[ord[2]] = 2; + /* get input */ if (i == argc) { fin = stdin; - } else if (i == argc-1) { + } else if (i < argc) { if ((fin = fopen(argv[i], "r")) == NULL) { fprintf(stderr, "%s: can't open file \"%s\"\n", progname, argv[i]); quit(1); } - } else { + 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", + progname, argv[i+1]); + quit(1); + } + if ((fin3 = fopen(argv[i+2], "r")) == NULL) { + fprintf(stderr, "%s: can't open file \"%s\"\n", + progname, argv[i+2]); + quit(1); + } + if (skipbytes && (fseek(fin2, skipbytes, 0) || + fseek(fin3, skipbytes, 0))) + goto seekerr; + } else if (i != argc-1) + fin = NULL; + } + if (fin == NULL) { fprintf(stderr, "%s: bad # file arguments\n", progname); quit(1); } @@ -157,24 +232,59 @@ unkopt: set_io(); if (reverse) { +#ifdef MSDOS + setmode(fileno(stdout), O_BINARY); + if (format != 'a' && format != 'i') + setmode(fileno(fin), O_BINARY); +#endif /* get header */ - if (header && checkheader(fin, fmtid, stdout) < 0) { - fprintf(stderr, "%s: wrong input format\n", progname); + if (header) { + if (checkheader(fin, fmtid, stdout) < 0) { + fprintf(stderr, "%s: wrong input format\n", + progname); + quit(1); + } + if (fin2 != NULL) { + getheader(fin2, NULL, NULL); + getheader(fin3, NULL, NULL); + } + } else + newheader("RADIANCE", stdout); + /* get resolution */ + if ((resolution && !fgetsresolu(&picres, fin)) || + picres.xr <= 0 || picres.yr <= 0) { + fprintf(stderr, "%s: missing resolution\n", progname); quit(1); } - if (picres.xr <= 0 || picres.yr <= 0) /* get resolution */ - if (!fgetsresolu(&picres, fin)) { - fprintf(stderr, "%s: missing resolution\n", + if (resolution && fin2 != NULL) { + RESOLU pres2; + if (!fgetsresolu(&pres2, fin2) || + pres2.or != picres.or || + pres2.xr != picres.xr || + pres2.yr != picres.yr || + !fgetsresolu(&pres2, fin3) || + pres2.or != picres.or || + pres2.xr != picres.xr || + pres2.yr != picres.yr) { + fprintf(stderr, "%s: resolution mismatch\n", progname); quit(1); } + } /* add to header */ printargs(i, argv, stdout); + if (expval < .99 || expval > 1.01) + fputexpos(expval, stdout); fputformat(COLRFMT, stdout); putchar('\n'); - fputsresolu(&picres, stdout); + fputsresolu(&picres, stdout); /* always put resolution */ valtopix(); } else { +#ifdef MSDOS + setmode(fileno(fin), O_BINARY); + if (format != 'a' && format != 'i') + setmode(fileno(stdout), O_BINARY); +#endif /* get header */ getheader(fin, checkhead, NULL); if (wrongformat) { @@ -182,22 +292,27 @@ unkopt: progname); quit(1); } - - if (picres.xr <= 0 || picres.yr <= 0) /* get picture size */ - if (!fgetsresolu(&picres, fin)) { - fprintf(stderr, "%s: missing resolution\n", - progname); - quit(1); - } + if (!fgetsresolu(&picres, fin)) { + fprintf(stderr, "%s: missing resolution\n", progname); + quit(1); + } if (header) { printargs(i, argv, stdout); + if (expval < .99 || expval > 1.01) + fputexpos(expval, stdout); fputformat(fmtid, stdout); putchar('\n'); } + if (resolution) /* put resolution */ + fputsresolu(&picres, stdout); pixtoval(); } quit(0); +seekerr: + fprintf(stderr, "%s: cannot skip %ld bytes on input\n", + progname, skipbytes); + quit(1); } @@ -208,17 +323,18 @@ char *line; double d; COLOR ctmp; - if (isformat(line)) { - formatval(fmt, line); + if (formatval(fmt, line)) wrongformat = strcmp(fmt, COLRFMT); - } else if (original && isexpos(line)) { + else if (original && isexpos(line)) { d = 1.0/exposval(line); scalecolor(exposure, d); + doexposure++; } else if (original && iscolcor(line)) { colcorval(ctmp, line); setcolor(exposure, colval(exposure,RED)/colval(ctmp,RED), colval(exposure,GRN)/colval(ctmp,GRN), colval(exposure,BLU)/colval(ctmp,BLU)); + doexposure++; } else if (header) fputs(line, stdout); } @@ -226,7 +342,7 @@ char *line; pixtoval() /* convert picture to values */ { - register COLOR *scanln; + register COLOR *scanln; int dogamma; COLOR lastc; FLOAT hv[2]; @@ -256,7 +372,7 @@ pixtoval() /* convert picture to values */ continue; else copycolor(lastc, scanln[x]); - if (original) + if (doexposure) multcolor(scanln[x], exposure); if (dogamma) setcolor(scanln[x], @@ -268,7 +384,7 @@ pixtoval() /* convert picture to values */ printf("%7d %7d ", (int)(hv[0]*picres.xr), (int)(hv[1]*picres.yr)); } - if ((*putval)(scanln[x], stdout) < 0) { + if ((*putval)(scanln[x]) < 0) { fprintf(stderr, "%s: write error\n", progname); quit(1); } @@ -281,7 +397,7 @@ pixtoval() /* convert picture to values */ valtopix() /* convert values to a pixel file */ { int dogamma; - register COLOR *scanln; + register COLOR *scanln; int y; register int x; @@ -293,9 +409,14 @@ valtopix() /* convert values to a pixel file */ dogamma = gamcor < .95 || gamcor > 1.05; for (y = 0; y < numscans(&picres); y++) { for (x = 0; x < scanlen(&picres); x++) { - if (!dataonly) + if (!dataonly) { fscanf(fin, "%*d %*d"); - if ((*getval)(scanln[x], fin) < 0) { + if (fin2 != NULL) { + fscanf(fin2, "%*d %*d"); + fscanf(fin3, "%*d %*d"); + } + } + if ((*getval)(scanln[x]) < 0) { fprintf(stderr, "%s: read error\n", progname); quit(1); } @@ -304,6 +425,8 @@ valtopix() /* convert values to a pixel file */ pow(colval(scanln[x],RED), gamcor), pow(colval(scanln[x],GRN), gamcor), pow(colval(scanln[x],BLU), gamcor)); + if (doexposure) + multcolor(scanln[x], exposure); } if (fwritescan(scanln, scanlen(&picres), stdout) < 0) { fprintf(stderr, "%s: write error\n", progname); @@ -321,118 +444,146 @@ int code; } -getcascii(col, fp) /* get an ascii color value from fp */ +getcascii(col) /* get an ascii color value from stream(s) */ COLOR col; -FILE *fp; { - double vd[3]; + double vd[3]; - if (fscanf(fp, "%lf %lf %lf", &vd[0], &vd[1], &vd[2]) != 3) - return(-1); - setcolor(col, vd[0], vd[1], vd[2]); + if (fin2 == NULL) { + if (fscanf(fin, "%lf %lf %lf", &vd[0], &vd[1], &vd[2]) != 3) + return(-1); + } else { + if (fscanf(fin, "%lf", &vd[0]) != 1 || + fscanf(fin2, "%lf", &vd[1]) != 1 || + fscanf(fin3, "%lf", &vd[2]) != 1) + return(-1); + } + setcolor(col, vd[rord[RED]], vd[rord[GRN]], vd[rord[BLU]]); return(0); } -getcdouble(col, fp) /* get a double color value from fp */ +getcdouble(col) /* get a double color value from stream(s) */ COLOR col; -FILE *fp; { - double vd[3]; + double vd[3]; - if (fread((char *)vd, sizeof(double), 3, fp) != 3) - return(-1); - setcolor(col, vd[0], vd[1], vd[2]); + if (fin2 == NULL) { + if (fread((char *)vd, sizeof(double), 3, fin) != 3) + return(-1); + } else { + if (fread((char *)vd, sizeof(double), 1, fin) != 1 || + fread((char *)(vd+1), sizeof(double), 1, fin2) != 1 || + fread((char *)(vd+2), sizeof(double), 1, fin3) != 1) + return(-1); + } + setcolor(col, vd[rord[RED]], vd[rord[GRN]], vd[rord[BLU]]); return(0); } -getcfloat(col, fp) /* get a float color value from fp */ +getcfloat(col) /* get a float color value from stream(s) */ COLOR col; -FILE *fp; { float vf[3]; - if (fread((char *)vf, sizeof(float), 3, fp) != 3) - return(-1); - setcolor(col, vf[0], vf[1], vf[2]); + if (fin2 == NULL) { + if (fread((char *)vf, sizeof(float), 3, fin) != 3) + return(-1); + } else { + if (fread((char *)vf, sizeof(float), 1, fin) != 1 || + fread((char *)(vf+1), sizeof(float), 1, fin2) != 1 || + fread((char *)(vf+2), sizeof(float), 1, fin3) != 1) + return(-1); + } + setcolor(col, vf[rord[RED]], vf[rord[GRN]], vf[rord[BLU]]); return(0); } -getcint(col, fp) /* get an int color value from fp */ +getcint(col) /* get an int color value from stream(s) */ COLOR col; -FILE *fp; { int vi[3]; - if (fscanf(fp, "%d %d %d", &vi[0], &vi[1], &vi[2]) != 3) - return(-1); - setcolor(col,(vi[0]+.5)/256.,(vi[1]+.5)/256.,(vi[2]+.5)/256.); + if (fin2 == NULL) { + if (fscanf(fin, "%d %d %d", &vi[0], &vi[1], &vi[2]) != 3) + return(-1); + } else { + if (fscanf(fin, "%d", &vi[0]) != 1 || + fscanf(fin2, "%d", &vi[1]) != 1 || + fscanf(fin3, "%d", &vi[2]) != 1) + return(-1); + } + setcolor(col, (vi[rord[RED]]+.5)/256., + (vi[rord[GRN]]+.5)/256., (vi[rord[BLU]]+.5)/256.); return(0); } -getcbyte(col, fp) /* get a byte color value from fp */ +getcbyte(col) /* get a byte color value from stream(s) */ COLOR col; -FILE *fp; { BYTE vb[3]; - if (fread((char *)vb, sizeof(BYTE), 3, fp) != 3) - return(-1); - setcolor(col,(vb[0]+.5)/256.,(vb[1]+.5)/256.,(vb[2]+.5)/256.); + if (fin2 == NULL) { + if (fread((char *)vb, sizeof(BYTE), 3, fin) != 3) + return(-1); + } else { + if (fread((char *)vb, sizeof(BYTE), 1, fin) != 1 || + fread((char *)(vb+1), sizeof(BYTE), 1, fin2) != 1 || + fread((char *)(vb+2), sizeof(BYTE), 1, fin3) != 1) + return(-1); + } + setcolor(col, (vb[rord[RED]]+.5)/256., + (vb[rord[GRN]]+.5)/256., (vb[rord[BLU]]+.5)/256.); return(0); } -getbascii(col, fp) /* get an ascii brightness value from fp */ +getbascii(col) /* get an ascii brightness value from fin */ COLOR col; -FILE *fp; { - double vd; + double vd; - if (fscanf(fp, "%lf", &vd) != 1) + if (fscanf(fin, "%lf", &vd) != 1) return(-1); setcolor(col, vd, vd, vd); return(0); } -getbdouble(col, fp) /* get a double brightness value from fp */ +getbdouble(col) /* get a double brightness value from fin */ COLOR col; -FILE *fp; { - double vd; + double vd; - if (fread((char *)&vd, sizeof(double), 1, fp) != 1) + if (fread((char *)&vd, sizeof(double), 1, fin) != 1) return(-1); setcolor(col, vd, vd, vd); return(0); } -getbfloat(col, fp) /* get a float brightness value from fp */ +getbfloat(col) /* get a float brightness value from fin */ COLOR col; -FILE *fp; { float vf; - if (fread((char *)&vf, sizeof(float), 1, fp) != 1) + if (fread((char *)&vf, sizeof(float), 1, fin) != 1) return(-1); setcolor(col, vf, vf, vf); return(0); } -getbint(col, fp) /* get an int brightness value from fp */ +getbint(col) /* get an int brightness value from fin */ COLOR col; -FILE *fp; { int vi; - double d; + double d; - if (fscanf(fp, "%d", &vi) != 1) + if (fscanf(fin, "%d", &vi) != 1) return(-1); d = (vi+.5)/256.; setcolor(col, d, d, d); @@ -440,14 +591,13 @@ FILE *fp; } -getbbyte(col, fp) /* get a byte brightness value from fp */ +getbbyte(col) /* get a byte brightness value from fin */ COLOR col; -FILE *fp; { BYTE vb; - double d; + double d; - if (fread((char *)&vb, sizeof(BYTE), 1, fp) != 1) + if (fread((char *)&vb, sizeof(BYTE), 1, fin) != 1) return(-1); d = (vb+.5)/256.; setcolor(col, d, d, d); @@ -455,185 +605,246 @@ FILE *fp; } -putcascii(col, fp) /* put an ascii color to fp */ +putcascii(col) /* put an ascii color to stdout */ COLOR col; -FILE *fp; { - fprintf(fp, "%15.3e %15.3e %15.3e\n", - colval(col,RED), - colval(col,GRN), - colval(col,BLU)); + fprintf(stdout, "%15.3e %15.3e %15.3e\n", + colval(col,ord[0]), + colval(col,ord[1]), + colval(col,ord[2])); - return(ferror(fp) ? -1 : 0); + return(ferror(stdout) ? -1 : 0); } -putcfloat(col, fp) /* put a float color to fp */ +putcfloat(col) /* put a float color to stdout */ COLOR col; -FILE *fp; { float vf[3]; - vf[0] = colval(col,RED); - vf[1] = colval(col,GRN); - vf[2] = colval(col,BLU); - fwrite((char *)vf, sizeof(float), 3, fp); + vf[0] = colval(col,ord[0]); + vf[1] = colval(col,ord[1]); + vf[2] = colval(col,ord[2]); + fwrite((char *)vf, sizeof(float), 3, stdout); - return(ferror(fp) ? -1 : 0); + return(ferror(stdout) ? -1 : 0); } -putcdouble(col, fp) /* put a double color to fp */ +putcdouble(col) /* put a double color to stdout */ COLOR col; -FILE *fp; { - double vd[3]; + double vd[3]; - vd[0] = colval(col,RED); - vd[1] = colval(col,GRN); - vd[2] = colval(col,BLU); - fwrite((char *)vd, sizeof(double), 3, fp); + vd[0] = colval(col,ord[0]); + vd[1] = colval(col,ord[1]); + vd[2] = colval(col,ord[2]); + fwrite((char *)vd, sizeof(double), 3, stdout); - return(ferror(fp) ? -1 : 0); + return(ferror(stdout) ? -1 : 0); } -putcint(col, fp) /* put an int color to fp */ +putcint(col) /* put an int color to stdout */ COLOR col; -FILE *fp; { - fprintf(fp, "%d %d %d\n", - (int)(colval(col,RED)*256.), - (int)(colval(col,GRN)*256.), - (int)(colval(col,BLU)*256.)); + fprintf(stdout, "%d %d %d\n", + (int)(colval(col,ord[0])*256.), + (int)(colval(col,ord[1])*256.), + (int)(colval(col,ord[2])*256.)); - return(ferror(fp) ? -1 : 0); + return(ferror(stdout) ? -1 : 0); } -putcbyte(col, fp) /* put a byte color to fp */ +putcbyte(col) /* put a byte color to stdout */ COLOR col; -FILE *fp; { register int i; BYTE vb[3]; - i = colval(col,RED)*256.; + i = colval(col,ord[0])*256.; vb[0] = min(i,255); - i = colval(col,GRN)*256.; + i = colval(col,ord[1])*256.; vb[1] = min(i,255); - i = colval(col,BLU)*256.; + i = colval(col,ord[2])*256.; vb[2] = min(i,255); - fwrite((char *)vb, sizeof(BYTE), 3, fp); + fwrite((char *)vb, sizeof(BYTE), 3, stdout); - return(ferror(fp) ? -1 : 0); + return(ferror(stdout) ? -1 : 0); } -putbascii(col, fp) /* put an ascii brightness to fp */ +putbascii(col) /* put an ascii brightness to stdout */ COLOR col; -FILE *fp; { - fprintf(fp, "%15.3e\n", bright(col)); + fprintf(stdout, "%15.3e\n", bright(col)); - return(ferror(fp) ? -1 : 0); + return(ferror(stdout) ? -1 : 0); } -putbfloat(col, fp) /* put a float brightness to fp */ +putbfloat(col) /* put a float brightness to stdout */ COLOR col; -FILE *fp; { float vf; vf = bright(col); - fwrite((char *)&vf, sizeof(float), 1, fp); + fwrite((char *)&vf, sizeof(float), 1, stdout); - return(ferror(fp) ? -1 : 0); + return(ferror(stdout) ? -1 : 0); } -putbdouble(col, fp) /* put a double brightness to fp */ +putbdouble(col) /* put a double brightness to stdout */ COLOR col; -FILE *fp; { - double vd; + double vd; vd = bright(col); - fwrite((char *)&vd, sizeof(double), 1, fp); + fwrite((char *)&vd, sizeof(double), 1, stdout); - return(ferror(fp) ? -1 : 0); + return(ferror(stdout) ? -1 : 0); } -putbint(col, fp) /* put an int brightness to fp */ +putbint(col) /* put an int brightness to stdout */ COLOR col; -FILE *fp; { - fprintf(fp, "%d\n", (int)(bright(col)*256.)); + fprintf(stdout, "%d\n", (int)(bright(col)*256.)); - return(ferror(fp) ? -1 : 0); + return(ferror(stdout) ? -1 : 0); } -putbbyte(col, fp) /* put a byte brightness to fp */ +putbbyte(col) /* put a byte brightness to stdout */ COLOR col; -FILE *fp; { register int i; BYTE vb; i = bright(col)*256.; vb = min(i,255); - fwrite((char *)&vb, sizeof(BYTE), 1, fp); + fwrite((char *)&vb, sizeof(BYTE), 1, stdout); - return(ferror(fp) ? -1 : 0); + return(ferror(stdout) ? -1 : 0); } +putpascii(col) /* put an ascii primary to stdout */ +COLOR col; +{ + fprintf(stdout, "%15.3e\n", colval(col,putprim)); + + return(ferror(stdout) ? -1 : 0); +} + + +putpfloat(col) /* put a float primary to stdout */ +COLOR col; +{ + float vf; + + vf = colval(col,putprim); + fwrite((char *)&vf, sizeof(float), 1, stdout); + + return(ferror(stdout) ? -1 : 0); +} + + +putpdouble(col) /* put a double primary to stdout */ +COLOR col; +{ + double vd; + + vd = colval(col,putprim); + fwrite((char *)&vd, sizeof(double), 1, stdout); + + return(ferror(stdout) ? -1 : 0); +} + + +putpint(col) /* put an int primary to stdout */ +COLOR col; +{ + fprintf(stdout, "%d\n", (int)(colval(col,putprim)*256.)); + + return(ferror(stdout) ? -1 : 0); +} + + +putpbyte(col) /* put a byte primary to stdout */ +COLOR col; +{ + register int i; + BYTE vb; + + i = colval(col,putprim)*256.; + vb = min(i,255); + fwrite((char *)&vb, sizeof(BYTE), 1, stdout); + + return(ferror(stdout) ? -1 : 0); +} + + set_io() /* set put and get functions */ { switch (format) { case 'a': /* ascii */ - if (brightonly) { + if (putprim == BRIGHT) { getval = getbascii; putval = putbascii; + } else if (putprim != ALL) { + getval = getbascii; + putval = putpascii; } else { getval = getcascii; putval = putcascii; } return; case 'f': /* binary float */ - if (brightonly) { + if (putprim == BRIGHT) { getval = getbfloat; putval = putbfloat; + } else if (putprim != ALL) { + getval = getbfloat; + putval = putpfloat; } else { getval = getcfloat; putval = putcfloat; } return; case 'd': /* binary double */ - if (brightonly) { + if (putprim == BRIGHT) { getval = getbdouble; putval = putbdouble; + } else if (putprim != ALL) { + getval = getbdouble; + putval = putpdouble; } else { getval = getcdouble; putval = putcdouble; } return; case 'i': /* integer */ - if (brightonly) { + if (putprim == BRIGHT) { getval = getbint; putval = putbint; + } else if (putprim != ALL) { + getval = getbint; + putval = putpint; } else { getval = getcint; putval = putcint; } return; case 'b': /* byte */ - if (brightonly) { + if (putprim == BRIGHT) { getval = getbbyte; putval = putbbyte; + } else if (putprim != ALL) { + getval = getbbyte; + putval = putpbyte; } else { getval = getcbyte; putval = putcbyte;