--- ray/src/px/ra_t8.c 1992/11/11 17:34:12 2.5 +++ ray/src/px/ra_t8.c 2004/03/28 20:33:14 2.13 @@ -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: ra_t8.c,v 2.13 2004/03/28 20:33:14 schorsch Exp $"; #endif - /* * ra_t8.c - program to convert between RADIANCE and * Targa 8-bit color-mapped images. @@ -12,24 +9,18 @@ static char SCCSid[] = "$SunId$ LBL"; */ #include +#include +#include +#include +#include "platform.h" +#include "rtmisc.h" #include "color.h" - #include "resolu.h" - +#include "clrtab.h" #include "targa.h" -#ifdef MSDOS -#include -#endif -#include - -#ifndef BSD -#define bcopy(s,d,n) (void)memcpy(d,s,n) -extern char *memcpy(); -#endif - #define goodpic(h) (my_imType(h) && my_mapType(h)) #define my_imType(h) (((h)->dataType==IM_CMAP || (h)->dataType==IM_CCMAP) \ && (h)->dataBits==8 && (h)->imType==0) @@ -38,30 +29,34 @@ extern char *memcpy(); #define taralloc(h) (BYTE *)emalloc((h)->x*(h)->y) -extern BYTE clrtab[][3]; - -extern char *ecalloc(), *emalloc(); - -extern long ftell(); - +BYTE clrtab[256][3]; +extern int samplefac; double gamv = 2.2; /* gamv correction */ - int bradj = 0; /* brightness adjustment */ - char *progname; - char errmsg[128]; - COLR *inl; - BYTE *tarData; - int xmax, ymax; +static int getint2(FILE *fp); +static void putint2(int i, FILE *fp); +static void quiterr(char *err); +static int getthead(struct hdStruct *hp, char *ip, FILE *fp); +static int putthead(struct hdStruct *hp, char *ip, FILE *fp); +static int getrhead(struct hdStruct *h, FILE *fp); +static void tg2ra(struct hdStruct *hp); +static void getmapped(int nc, int dith); +static void getgrey(int nc); +static void writetarga(struct hdStruct *h, BYTE *d, FILE *fp); +static void readtarga(struct hdStruct *h, BYTE *data, FILE *fp); -main(argc, argv) -int argc; -char *argv[]; + +int +main( + int argc, + char *argv[] +) { struct hdStruct head; int dither = 1; @@ -69,13 +64,11 @@ char *argv[]; int ncolors = 256; int greyscale = 0; int i; -#ifdef MSDOS - extern int _fmode; - _fmode = O_BINARY; - setmode(fileno(stdin), O_BINARY); - setmode(fileno(stdout), O_BINARY); -#endif + SET_DEFAULT_BINARY(); + SET_FILE_BINARY(stdin); + SET_FILE_BINARY(stdout); progname = argv[0]; + samplefac = 0; for (i = 1; i < argc; i++) if (argv[i][0] == '-') @@ -100,6 +93,9 @@ char *argv[]; case 'c': ncolors = atoi(argv[++i]); break; + case 'n': + samplefac = atoi(argv[++i]); + break; default: goto userr; } @@ -125,6 +121,7 @@ char *argv[]; xmax = head.x; ymax = head.y; /* put header */ + newheader("RADIANCE", stdout); printargs(i, argv, stdout); fputformat(COLRFMT, stdout); putchar('\n'); @@ -147,7 +144,7 @@ char *argv[]; quiterr(NULL); userr: fprintf(stderr, - "Usage: %s [-d][-c ncolors][-b][-g gamv][-e +/-stops] input [output]\n", + "Usage: %s [-d][-n samp][-c ncolors][-b][-g gamv][-e +/-stops] input [output]\n", progname); fprintf(stderr, " Or: %s -r [-g gamv][-e +/-stops] [input [output]]\n", progname); @@ -155,9 +152,10 @@ userr: } -int -getint2(fp) /* get a 2-byte positive integer */ -register FILE *fp; +static int +getint2( /* get a 2-byte positive integer */ + register FILE *fp +) { register int b1, b2; @@ -168,17 +166,21 @@ register FILE *fp; } -putint2(i, fp) /* put a 2-byte positive integer */ -register int i; -register FILE *fp; +static void +putint2( /* put a 2-byte positive integer */ + register int i, + register FILE *fp +) { putc(i&0xff, fp); putc(i>>8&0xff, fp); } -quiterr(err) /* print message and exit */ -char *err; +static void +quiterr( /* print message and exit */ + char *err +) { if (err != NULL) { fprintf(stderr, "%s: %s\n", progname, err); @@ -188,6 +190,7 @@ char *err; } +void eputs(s) char *s; { @@ -195,6 +198,7 @@ char *s; } +void quit(code) int code; { @@ -202,10 +206,12 @@ int code; } -getthead(hp, ip, fp) /* read header from input */ -struct hdStruct *hp; -char *ip; -register FILE *fp; +static int +getthead( /* read header from input */ + struct hdStruct *hp, + char *ip, + register FILE *fp +) { int nidbytes; @@ -235,10 +241,12 @@ register FILE *fp; } -putthead(hp, ip, fp) /* write header to output */ -struct hdStruct *hp; -char *ip; -register FILE *fp; +static int +putthead( /* write header to output */ + struct hdStruct *hp, + char *ip, + register FILE *fp +) { if (ip != NULL) putc(strlen(ip), fp); @@ -263,9 +271,11 @@ register FILE *fp; } -getrhead(h, fp) /* load RADIANCE input file header */ -register struct hdStruct *h; -FILE *fp; +static int +getrhead( /* load RADIANCE input file header */ + register struct hdStruct *h, + FILE *fp +) { /* get header info. */ if (checkheader(fp, COLRFMT, NULL) < 0 || @@ -293,8 +303,10 @@ FILE *fp; } -tg2ra(hp) /* targa file to RADIANCE file */ -struct hdStruct *hp; +static void +tg2ra( /* targa file to RADIANCE file */ + struct hdStruct *hp +) { union { BYTE c3[256][3]; @@ -337,48 +349,65 @@ struct hdStruct *hp; if (fwritecolrs(scanline, xmax, stdout) < 0) quiterr("error writing RADIANCE file"); } - free((char *)scanline); - free((char *)tarData); + free((void *)scanline); + free((void *)tarData); } -getmapped(nc, dith) /* read in and quantize image */ -int nc; /* number of colors to use */ -int dith; /* use dithering? */ +static void +getmapped( /* read in and quantize image */ + int nc, /* number of colors to use */ + int dith /* use dithering? */ +) { long fpos; register int y; setcolrgam(gamv); fpos = ftell(stdin); - new_histo(); /* build histogram */ + if ((samplefac ? neu_init(xmax*ymax) : new_histo(xmax*ymax)) == -1) + quiterr("cannot initialized histogram"); for (y = ymax-1; y >= 0; y--) { if (freadcolrs(inl, xmax, stdin) < 0) quiterr("error reading Radiance input"); if (bradj) shiftcolrs(inl, xmax, bradj); colrs_gambs(inl, xmax); - cnt_colrs(inl, xmax); + if (samplefac) + neu_colrs(inl, xmax); + else + cnt_colrs(inl, xmax); } if (fseek(stdin, fpos, 0) == EOF) quiterr("Radiance input must be from a file"); - new_clrtab(nc); /* map colors */ + if (samplefac) /* map colors */ + neu_clrtab(nc); + else + new_clrtab(nc); for (y = ymax-1; y >= 0; y--) { if (freadcolrs(inl, xmax, stdin) < 0) quiterr("error reading Radiance input"); if (bradj) shiftcolrs(inl, xmax, bradj); colrs_gambs(inl, xmax); - if (dith) - dith_colrs(tarData+y*xmax, inl, xmax); + if (samplefac) + if (dith) + neu_dith_colrs(tarData+y*xmax, inl, xmax); + else + neu_map_colrs(tarData+y*xmax, inl, xmax); else - map_colrs(tarData+y*xmax, inl, xmax); + if (dith) + dith_colrs(tarData+y*xmax, inl, xmax); + else + map_colrs(tarData+y*xmax, inl, xmax); } } -getgrey(nc) /* read in and convert to greyscale image */ -int nc; /* number of colors to use */ +static void +getgrey( /* read in and convert to greyscale image */ + int nc /* number of colors to use */ +) { int y; register BYTE *dp; @@ -409,10 +438,12 @@ int nc; /* number of colors to use */ } -writetarga(h, d, fp) /* write out targa data */ -struct hdStruct *h; -BYTE *d; -FILE *fp; +static void +writetarga( /* write out targa data */ + struct hdStruct *h, + BYTE *d, + FILE *fp +) { register int i, j; @@ -428,10 +459,12 @@ FILE *fp; } -readtarga(h, data, fp) /* read in targa data */ -struct hdStruct *h; -BYTE *data; -FILE *fp; +static void +readtarga( /* read in targa data */ + struct hdStruct *h, + BYTE *data, + FILE *fp +) { register int cnt, c; register BYTE *dp;