--- ray/src/px/ra_bmp.c 2004/03/28 20:33:14 2.3 +++ ray/src/px/ra_bmp.c 2004/10/04 17:44:22 2.10 @@ -1,59 +1,83 @@ #ifndef lint -static const char RCSid[] = "$Id: ra_bmp.c,v 2.3 2004/03/28 20:33:14 schorsch Exp $"; +static const char RCSid[] = "$Id: ra_bmp.c,v 2.10 2004/10/04 17:44:22 greg Exp $"; #endif /* * program to convert between RADIANCE and Windows BMP file */ #include +#include #include #include "platform.h" #include "color.h" +#include "tonemap.h" #include "resolu.h" #include "bmpfile.h" -int bradj = 0; /* brightness adjustment */ +int bradj = 0; /* brightness adjustment */ -double gamcor = 2.2; /* gamma correction value */ +double gamcor = 2.2; /* gamma correction value */ -char *progname; +char *progname; -static void quiterr(const char *); -static void rad2bmp(FILE *rfp, BMPWriter *bwr, int inv, int gry); +static void quiterr(const char *err); +static void tmap2bmp(char *fnin, char *fnout, char *expec, + RGBPRIMP monpri, double gamval); +static void rad2bmp(FILE *rfp, BMPWriter *bwr, int inv, RGBPRIMP monpri); static void bmp2rad(BMPReader *brd, FILE *rfp, int inv); +static RGBPRIMP rgbinp = stdprims; /* RGB input primitives */ +static RGBPRIMS myinprims; /* custom primitives holder */ +static gethfunc headline; + + int main(int argc, char *argv[]) { - char *inpfile=NULL, *outfile=NULL; - int gryflag = 0; - int reverse = 0; - RESOLU rs; - int i; + char *inpfile=NULL, *outfile=NULL; + char *expec = NULL; + int reverse = 0; + RGBPRIMP rgbp = stdprims; + RGBPRIMS myprims; + RESOLU rs; + int i; progname = argv[0]; for (i = 1; i < argc; i++) - if (argv[i][0] == '-') + if (argv[i][0] == '-' && argv[i][1]) switch (argv[i][1]) { case 'b': - gryflag = 1; + rgbp = NULL; break; case 'g': gamcor = atof(argv[++i]); break; case 'e': if (argv[i+1][0] != '+' && argv[i+1][0] != '-') + expec = argv[++i]; + else + bradj = atoi(argv[++i]); + break; + case 'p': + if (argc-i < 9) goto userr; - bradj = atoi(argv[++i]); + myprims[RED][CIEX] = atof(argv[++i]); + myprims[RED][CIEY] = atof(argv[++i]); + myprims[GRN][CIEX] = atof(argv[++i]); + myprims[GRN][CIEY] = atof(argv[++i]); + myprims[BLU][CIEX] = atof(argv[++i]); + myprims[BLU][CIEY] = atof(argv[++i]); + myprims[WHT][CIEX] = atof(argv[++i]); + myprims[WHT][CIEY] = atof(argv[++i]); + if (rgbp == stdprims) + rgbp = myprims; break; case 'r': reverse = !reverse; break; - case '\0': - break; default: goto userr; } @@ -72,6 +96,13 @@ main(int argc, char *argv[]) if (i == argc-2 && strcmp(argv[i+1], "-")) outfile = argv[i+1]; + /* check for tone-mapping */ + if (expec != NULL) { + if (reverse) + goto userr; + tmap2bmp(inpfile, outfile, expec, rgbp, gamcor); + return(0); + } setcolrgam(gamcor); /* set up conversion */ @@ -122,23 +153,24 @@ main(int argc, char *argv[]) exit(1); } /* get header info. */ - if (checkheader(stdin, COLRFMT, NULL) < 0 || + if (getheader(stdin, headline, NULL) < 0 || !fgetsresolu(&rs, stdin)) quiterr("bad Radiance picture format"); /* initialize BMP header */ - if (gryflag) { - hdr = BMPmappedHeader(numscans(&rs), - scanlen(&rs), 0, 256); + if (rgbp == NULL) { + hdr = BMPmappedHeader(scanlen(&rs), + numscans(&rs), 0, 256); + /* if (outfile != NULL) hdr->compr = BI_RLE8; + */ } else - hdr = BMPtruecolorHeader(numscans(&rs), - scanlen(&rs), 0); + hdr = BMPtruecolorHeader(scanlen(&rs), + numscans(&rs), 0); if (hdr == NULL) quiterr("cannot initialize BMP header"); /* set up output direction */ - hdr->yIsDown = (rs.rt & YDECR) && - ((outfile == NULL) | (hdr->compr == BI_RLE8)); + hdr->yIsDown = ((outfile == NULL) | (hdr->compr == BI_RLE8)); /* open BMP output */ if (outfile != NULL) wtr = BMPopenOutputFile(outfile, hdr); @@ -147,19 +179,21 @@ main(int argc, char *argv[]) if (wtr == NULL) quiterr("cannot allocate writer structure"); /* convert file */ - rad2bmp(stdin, wtr, !hdr->yIsDown && (rs.rt&YDECR), gryflag); + rad2bmp(stdin, wtr, !hdr->yIsDown, rgbp); /* flush output */ if (fflush((FILE *)wtr->c_data) < 0) quiterr("error writing BMP output"); BMPcloseOutput(wtr); } - exit(0); /* success */ + return(0); /* success */ userr: fprintf(stderr, - "Usage: %s [-r][-g gamma][-e +/-stops] [input [output]]\n", +"Usage: %s [-b][-g gamma][-e spec][-p xr yr xg yg xb yb xw yw] [input|- [output]]\n", progname); - exit(1); - return(1); /* gratis return */ + fprintf(stderr, + " or: %s -r [-g gamma][-e +/-stops] [input|- [output]]\n", + progname); + return(1); } /* print message and exit */ @@ -173,17 +207,58 @@ quiterr(const char *err) exit(0); } +/* process header line (don't echo) */ +static int +headline(char *s, void *p) +{ + char fmt[32]; + + if (formatval(fmt, s)) { /* check if format string */ + if (!strcmp(fmt,COLRFMT)) + return(0); + if (!strcmp(fmt,CIEFMT)) { + rgbinp = TM_XYZPRIM; + return(0); + } + return(-1); + } + if (isprims(s)) { /* get input primaries */ + primsval(myinprims, s); + rgbinp = myinprims; + return(0); + } + /* should I grok colcorr also? */ + return(0); +} + + /* convert Radiance picture to BMP */ static void -rad2bmp(FILE *rfp, BMPWriter *bwr, int inv, int gry) +rad2bmp(FILE *rfp, BMPWriter *bwr, int inv, RGBPRIMP monpri) { + int usexfm = 0; + COLORMAT xfm; COLR *scanin; + COLOR cval; int y, yend, ystp; int x; /* allocate scanline */ scanin = (COLR *)malloc(bwr->hdr->width*sizeof(COLR)); if (scanin == NULL) quiterr("out of memory in rad2bmp"); + /* set up color conversion */ + usexfm = (monpri != NULL ? rgbinp != monpri : + rgbinp != TM_XYZPRIM && rgbinp != stdprims); + if (usexfm) { + double expcomp = pow(2.0, (double)bradj); + if (rgbinp == TM_XYZPRIM) + compxyz2rgbWBmat(xfm, monpri); + else + comprgb2rgbWBmat(xfm, rgbinp, monpri); + for (y = 0; y < 3; y++) + for (x = 0; x < 3; x++) + xfm[y][x] *= expcomp; + } /* convert image */ if (inv) { y = bwr->hdr->height - 1; @@ -196,12 +271,21 @@ rad2bmp(FILE *rfp, BMPWriter *bwr, int inv, int gry) for ( ; y != yend; y += ystp) { if (freadcolrs(scanin, bwr->hdr->width, rfp) < 0) quiterr("error reading Radiance picture"); - if (bradj) + if (usexfm) + for (x = bwr->hdr->width; x--; ) { + colr_color(cval, scanin[x]); + colortrans(cval, xfm, cval); + setcolr(scanin[x], colval(cval,RED), + colval(cval,GRN), + colval(cval,BLU)); + } + else if (bradj) shiftcolrs(scanin, bwr->hdr->width, bradj); - for (x = gry ? bwr->hdr->width : 0; x--; ) - scanin[x][GRN] = normbright(scanin[x]); + if (monpri == NULL && rgbinp != TM_XYZPRIM) + for (x = bwr->hdr->width; x--; ) + scanin[x][GRN] = normbright(scanin[x]); colrs_gambs(scanin, bwr->hdr->width); - if (gry) + if (monpri == NULL) for (x = bwr->hdr->width; x--; ) bwr->scanline[x] = scanin[x][GRN]; else @@ -257,4 +341,81 @@ bmp2rad(BMPReader *brd, FILE *rfp, int inv) } /* clean up */ free((void *)scanout); +} + +/* Tone-map and convert Radiance picture */ +static void +tmap2bmp(char *fnin, char *fnout, char *expec, RGBPRIMP monpri, double gamval) +{ + int tmflags; + BMPHeader *hdr; + BMPWriter *wtr; + FILE *fp; + int xr, yr; + BYTE *pa; + int i; + /* check tone-mapping spec */ + i = strlen(expec); + if (i && !strncmp(expec, "auto", i)) + tmflags = TM_F_CAMERA; + else if (i && !strncmp(expec, "human", i)) + tmflags = TM_F_HUMAN & ~TM_F_UNIMPL; + else if (i && !strncmp(expec, "linear", i)) + tmflags = TM_F_LINEAR; + else + quiterr("illegal exposure specification (auto|human|linear)"); + if (monpri == NULL) { + tmflags |= TM_F_BW; + monpri = stdprims; + } + /* open Radiance input */ + if (fnin == NULL) + fp = stdin; + else if ((fp = fopen(fnin, "r")) == NULL) { + fprintf(stderr, "%s: cannot open\n", fnin); + exit(1); + } + /* tone-map picture */ + if (tmMapPicture(&pa, &xr, &yr, tmflags, monpri, gamval, + 0., 0., fnin, fp) != TM_E_OK) + exit(1); + /* initialize BMP header */ + if (tmflags & TM_F_BW) { + hdr = BMPmappedHeader(xr, yr, 0, 256); + if (fnout != NULL) + hdr->compr = BI_RLE8; + } else + hdr = BMPtruecolorHeader(xr, yr, 0); + if (hdr == NULL) + quiterr("cannot initialize BMP header"); + /* open BMP output */ + if (fnout != NULL) + wtr = BMPopenOutputFile(fnout, hdr); + else + wtr = BMPopenOutputStream(stdout, hdr); + if (wtr == NULL) + quiterr("cannot allocate writer structure"); + /* write to BMP file */ + while (wtr->yscan < yr) { + BYTE *scn = pa + xr*((tmflags & TM_F_BW) ? 1 : 3)* + (yr-1 - wtr->yscan); + if (tmflags & TM_F_BW) + memcpy((void *)wtr->scanline, (void *)scn, xr); + else + for (i = xr; i--; ) { + wtr->scanline[3*i] = scn[3*i+BLU]; + wtr->scanline[3*i+1] = scn[3*i+GRN]; + wtr->scanline[3*i+2] = scn[3*i+RED]; + } + if ((i = BMPwriteScanline(wtr)) != BIR_OK) + quiterr(BMPerrorMessage(i)); + } + /* flush output */ + if (fflush((FILE *)wtr->c_data) < 0) + quiterr("error writing BMP output"); + /* clean up */ + if (fnin != NULL) + fclose(fp); + free((void *)pa); + BMPcloseOutput(wtr); }