--- ray/src/px/ra_pr24.c 1990/10/18 12:00:48 1.1 +++ ray/src/px/ra_pr24.c 2003/06/05 19:29:34 2.10 @@ -1,22 +1,22 @@ -/* Copyright (c) 1990 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: ra_pr24.c,v 2.10 2003/06/05 19:29:34 schorsch Exp $"; #endif - /* * program to convert between RADIANCE and 24-bit rasterfiles. */ #include +#include +#include +#include "platform.h" #include "rasterfile.h" - #include "color.h" +#include "resolu.h" -extern double atof(), pow(); +double gamcor = 2.2; /* gamma correction */ -double gamma = 2.0; /* gamma correction */ +int bradj = 0; /* brightness adjustment */ char *progname; @@ -30,17 +30,28 @@ char *argv[]; struct rasterfile head; int reverse = 0; int i; - + SET_DEFAULT_BINARY(); + SET_FILE_BINARY(stdin); + SET_FILE_BINARY(stdout); progname = argv[0]; + head.ras_type = RT_STANDARD; for (i = 1; i < argc; i++) if (argv[i][0] == '-') switch (argv[i][1]) { case 'g': - gamma = atof(argv[++i]); + gamcor = atof(argv[++i]); break; + case 'e': + if (argv[i+1][0] != '+' && argv[i+1][0] != '-') + goto userr; + bradj = atoi(argv[++i]); + break; case 'r': - reverse = !reverse; + if (!strcmp(argv[i], "-rgb")) + head.ras_type = RT_FORMAT_RGB; + else + reverse = 1; break; default: goto userr; @@ -56,10 +67,11 @@ char *argv[]; exit(1); } if (i == argc-2 && freopen(argv[i+1], "w", stdout) == NULL) { - fprintf(stderr, "can't open output \"%s\"\n", + fprintf(stderr, "%s: can't open output \"%s\"\n", progname, argv[i+1]); exit(1); } + setcolrgam(gamcor); if (reverse) { /* get header */ if (fread((char *)&head, sizeof(head), 1, stdin) != 1) @@ -68,38 +80,39 @@ char *argv[]; quiterr("bad raster format"); xmax = head.ras_width; ymax = head.ras_height; - if (head.ras_type != RT_STANDARD || - head.ras_maptype != RMT_NONE || - head.ras_depth != 24) + if ((head.ras_type != RT_STANDARD + && head.ras_type != RT_FORMAT_RGB) + || head.ras_maptype != RMT_NONE + || head.ras_depth != 24) quiterr("incompatible format"); /* put header */ + newheader("RADIANCE", stdout); printargs(i, argv, stdout); + fputformat(COLRFMT, stdout); putchar('\n'); - fputresolu(YMAJOR|YDECR, xmax, ymax, stdout); + fprtresolu(xmax, ymax, stdout); /* convert file */ - pr2ra(); + pr2ra(head.ras_type, head.ras_length/ymax - xmax*3); } else { - /* discard input header */ - getheader(stdin, NULL); - /* get resolution */ - if (fgetresolu(&xmax, &ymax, stdin) != (YMAJOR|YDECR)) - quiterr("bad picture size"); + /* get header info. */ + if (checkheader(stdin, COLRFMT, NULL) < 0 || + fgetresolu(&xmax, &ymax, stdin) < 0) + quiterr("bad picture format"); /* write rasterfile header */ head.ras_magic = RAS_MAGIC; - head.ras_width = xmax; + head.ras_width = xmax + (xmax&1); head.ras_height = ymax; head.ras_depth = 24; - head.ras_length = xmax*ymax*3; - head.ras_type = RT_STANDARD; + head.ras_length = head.ras_width*head.ras_height*3; head.ras_maptype = RMT_NONE; head.ras_maplength = 0; fwrite((char *)&head, sizeof(head), 1, stdout); /* convert file */ - ra2pr(); + ra2pr(head.ras_type, head.ras_length/ymax - xmax*3); } exit(0); userr: - fprintf(stderr, "Usage: %s [-r][-g gamma] [input [output]]\n", + fprintf(stderr, "Usage: %s [-r][-g gamma][-e +/-stops] [input [output]]\n", progname); exit(1); } @@ -116,67 +129,86 @@ char *err; } -pr2ra() /* convert 24-bit scanlines to Radiance picture */ +pr2ra(rf, pad) /* convert 24-bit scanlines to Radiance picture */ +int rf; +int pad; { - float gmap[256]; - int r, g, b; - COLOR *scanout; + COLR *scanout; register int x; int y; /* allocate scanline */ - scanout = (COLOR *)malloc(xmax*sizeof(COLOR)); + scanout = (COLR *)malloc(xmax*sizeof(COLR)); if (scanout == NULL) quiterr("out of memory in pr2ra"); - /* compute gamma correction */ - for (x = 0; x < 256; x++) - gmap[x] = pow((x+.5)/256., gamma); /* convert image */ for (y = ymax-1; y >= 0; y--) { - for (x = 0; x < xmax; x++) { - r = getc(stdin); g = getc(stdin); - if ((b = getc(stdin)) == EOF) - quiterr("error reading rasterfile"); - setcolor(scanout[x], gmap[r], gmap[g], gmap[b]); - } - if (fwritescan(scanout, xmax, stdout) < 0) + if (rf == RT_FORMAT_RGB) + for (x = 0; x < xmax; x++) { + scanout[x][RED] = getc(stdin); + scanout[x][GRN] = getc(stdin); + scanout[x][BLU] = getc(stdin); + } + else + for (x = 0; x < xmax; x++) { + scanout[x][BLU] = getc(stdin); + scanout[x][GRN] = getc(stdin); + scanout[x][RED] = getc(stdin); + } + for (x = pad; x--; getc(stdin)); + if (feof(stdin) || ferror(stdin)) + quiterr("error reading rasterfile"); + gambs_colrs(scanout, xmax); + if (bradj) + shiftcolrs(scanout, xmax, bradj); + if (fwritecolrs(scanout, xmax, stdout) < 0) quiterr("error writing Radiance picture"); } /* free scanline */ - free((char *)scanout); + free((void *)scanout); } -ra2pr() /* convert Radiance scanlines to 24-bit rasterfile */ +ra2pr(rf, pad) /* convert Radiance scanlines to 24-bit rasterfile */ +int rf; +int pad; { -#define map(v) ((v)>=1.0 ? 255 : gmap[(int)(1024.*(v))]) - unsigned char gmap[1024]; - COLOR *scanin; + int ord[3]; + COLR *scanin; register int x; - register int c; int y; /* allocate scanline */ - scanin = (COLOR *)malloc(xmax*sizeof(COLOR)); + scanin = (COLR *)malloc(xmax*sizeof(COLR)); if (scanin == NULL) - quiterr("out of memory in pr2ra"); - /* compute gamma correction */ - for (x = 0; x < 256; x++) - gmap[x] = 256.*pow((x+.5)/1024., 1./gamma); + quiterr("out of memory in ra2pr"); + if (rf == RT_FORMAT_RGB) { + ord[0] = RED; ord[1] = GRN; ord[2] = BLU; + } else { + ord[0] = BLU; ord[1] = GRN; ord[2] = RED; + } /* convert image */ for (y = ymax-1; y >= 0; y--) { - if (freadscan(scanin, xmax, stdin) < 0) + if (freadcolrs(scanin, xmax, stdin) < 0) quiterr("error reading Radiance picture"); - for (x = 0; x < xmax; x++) { - c = map(colval(scanin[x],RED)); - putc(c, stdout); - c = map(colval(scanin[x],GRN)); - putc(c, stdout); - c = map(colval(scanin[x],BLU)); - putc(c, stdout); - } + if (bradj) + shiftcolrs(scanin, xmax, bradj); + colrs_gambs(scanin, xmax); + if (rf == RT_FORMAT_RGB) + for (x = 0; x < xmax; x++) { + putc(scanin[x][RED], stdout); + putc(scanin[x][GRN], stdout); + putc(scanin[x][BLU], stdout); + } + else + for (x = 0; x < xmax; x++) { + putc(scanin[x][BLU], stdout); + putc(scanin[x][GRN], stdout); + putc(scanin[x][RED], stdout); + } + for (x = 0; x < pad; x++) + putc(scanin[xmax-1][ord[x%3]], stdout); if (ferror(stdout)) quiterr("error writing rasterfile"); } /* free scanline */ - free((char *)scanin); -#undef map + free((void *)scanin); }