--- ray/src/common/tmapcolrs.c 1998/10/08 16:31:02 3.5 +++ ray/src/common/tmapcolrs.c 2004/01/02 11:36:26 3.15 @@ -1,22 +1,25 @@ -/* Copyright (c) 1998 Silicon Graphics, Inc. */ - #ifndef lint -static char SCCSid[] = "$SunId$ SGI"; +static const char RCSid[] = "$Id: tmapcolrs.c,v 3.15 2004/01/02 11:36:26 schorsch Exp $"; #endif - /* * Routines for tone mapping on Radiance RGBE and XYZE pictures. - * See tonemap.h for detailed function descriptions. + * + * Externals declared in tonemap.h */ +#include "copyright.h" + #include +#include #include +#include #include "tmprivat.h" #include "resolu.h" +#ifndef TM_PIC_CTRANS +#define TM_PIC_CTRANS 1 /* transform colors? (expensive) */ +#endif -extern char *tempbuffer(); - #define GAMTSZ 1024 typedef struct { @@ -25,9 +28,10 @@ typedef struct { TMbright inpsfb; /* encoded tm->inpsf */ } COLRDATA; -static MEM_PTR colrInit(); -static void colrNewSpace(); -extern void free(); +static MEM_PTR colrInit(struct tmStruct *); +static void colrNewSpace(struct tmStruct *); +static gethfunc headline; + static struct tmPackage colrPkg = { /* our package functions */ colrInit, colrNewSpace, free }; @@ -35,11 +39,10 @@ static int colrReg = -1; /* our package registration #define LOGISZ 260 static TMbright logi[LOGISZ]; -static BYTE photofact[BMESUPPER-BMESLOWER]; int -tmCvColrs(ls, cs, scan, len) /* tone map RGBE/XYZE colors */ +tmCvColrs(ls, cs, scan, len) /* convert RGBE/XYZE colors */ TMbright *ls; BYTE *cs; COLR *scan; @@ -52,9 +55,13 @@ int len; if (tmTop == NULL) returnErr(TM_E_TMINVAL); - if (ls == NULL | scan == NULL | len < 0) + if ((ls == NULL) | (scan == NULL) | (len < 0)) returnErr(TM_E_ILLEGAL); +#if TM_PIC_CTRANS if (tmNeedMatrix(tmTop)) { /* need floating point */ +#else + if (tmTop->inppri == TM_XYZPRIM) { /* no way around this */ +#endif register COLOR *newscan; newscan = (COLOR *)tempbuffer(len*sizeof(COLOR)); if (newscan == NULL) @@ -63,18 +70,15 @@ int len; colr_color(newscan[i], scan[i]); return(tmCvColors(ls, cs, newscan, len)); } - if (colrReg == -1) { /* build tables if necessary */ + if (colrReg < 0) { /* build tables if necessary */ colrReg = tmRegPkg(&colrPkg); if (colrReg < 0) returnErr(TM_E_CODERR1); for (i = 256; i--; ) logi[i] = TM_BRTSCALE*log((i+.5)/256.) - .5; for (i = 256; i < LOGISZ; i++) - logi[i] = logi[255]; - for (i = BMESLOWER; i < BMESUPPER; i++) - photofact[i-BMESLOWER] = 256. * - (tmLuminance(i) - LMESLOWER) / - (LMESUPPER - LMESLOWER); + logi[i] = 0; + tmMkMesofact(); } if ((cd = (COLRDATA *)tmPkgData(tmTop,colrReg)) == NULL) returnErr(TM_E_NOMEM); @@ -84,35 +88,37 @@ int len; li = ( cd->clfb[RED]*cmon[RED] + cd->clfb[GRN]*cmon[GRN] + cd->clfb[BLU]*cmon[BLU] ) >> 8; - bi = BRT2SCALE*(cmon[EXP]-COLXS) + + bi = BRT2SCALE(cmon[EXP]-COLXS) + logi[li] + cd->inpsfb; - if (bi < MINBRT) { - bi = MINBRT-1; /* bogus value */ - li++; /* avoid li==0 */ + if (li <= 0) { + bi = TM_NOBRT; /* bogus value */ + li = 1; /* avoid li==0 */ } ls[i] = bi; if (cs == TM_NOCHROM) /* no color? */ continue; - if (tmTop->flags & TM_F_BW) - cmon[RED] = cmon[GRN] = cmon[BLU] = li; /* mesopic adj. */ if (tmTop->flags & TM_F_MESOPIC && bi < BMESUPPER) { register int pf, sli = normscot(cmon); if (bi < BMESLOWER) cmon[RED] = cmon[GRN] = cmon[BLU] = sli; else { - pf = photofact[bi-BMESLOWER]; + if (tmTop->flags & TM_F_BW) + cmon[RED] = cmon[GRN] = cmon[BLU] = li; + pf = tmMesofact[bi-BMESLOWER]; sli *= 256 - pf; cmon[RED] = ( sli + pf*cmon[RED] ) >> 8; cmon[GRN] = ( sli + pf*cmon[GRN] ) >> 8; cmon[BLU] = ( sli + pf*cmon[BLU] ) >> 8; } + } else if (tmTop->flags & TM_F_BW) { + cmon[RED] = cmon[GRN] = cmon[BLU] = li; } - bi = ( (int4)GAMTSZ*cd->clfb[RED]*cmon[RED]/li ) >> 8; + bi = ( (int32)GAMTSZ*cd->clfb[RED]*cmon[RED]/li ) >> 8; cs[3*i ] = bi>=GAMTSZ ? 255 : cd->gamb[bi]; - bi = ( (int4)GAMTSZ*cd->clfb[GRN]*cmon[GRN]/li ) >> 8; + bi = ( (int32)GAMTSZ*cd->clfb[GRN]*cmon[GRN]/li ) >> 8; cs[3*i+1] = bi>=GAMTSZ ? 255 : cd->gamb[bi]; - bi = ( (int4)GAMTSZ*cd->clfb[BLU]*cmon[BLU]/li ) >> 8; + bi = ( (int32)GAMTSZ*cd->clfb[BLU]*cmon[BLU]/li ) >> 8; cs[3*i+2] = bi>=GAMTSZ ? 255 : cd->gamb[bi]; } returnOK; @@ -133,11 +139,13 @@ static struct radhead { static int -headline(s, rh) /* grok a header line */ -register char *s; -register struct radhead *rh; +headline( /* grok a header line */ + register char *s, + void *vrh +) { char fmt[32]; + register struct radhead *rh = vrh; if (formatval(fmt, s)) { if (!strcmp(fmt, COLRFMT)) @@ -146,17 +154,18 @@ register struct radhead *rh; rh->format = FMTCIE; else rh->format = FMTBAD; - return; + return(0); } if (isexpos(s)) { rh->expos *= exposval(s); - return; + return(0); } if (isprims(s)) { primsval(rh->mypri, s); rh->primp = rh->mypri; - return; + return(0); } + return(0); } @@ -177,15 +186,17 @@ FILE *fp; /* check arguments */ if (tmTop == NULL) returnErr(TM_E_TMINVAL); - if (lpp == NULL | xp == NULL | yp == NULL | - (fname == NULL & fp == TM_GETFILE)) + if ((lpp == NULL) | (xp == NULL) | (yp == NULL) | + ((fname == NULL) & (fp == TM_GETFILE))) returnErr(TM_E_ILLEGAL); *xp = *yp = 0; /* error precaution */ if ((inpf = fp) == TM_GETFILE && (inpf = fopen(fname, "r")) == NULL) returnErr(TM_E_BADFILE); + *lpp = NULL; + if (cpp != TM_NOCHROMP) *cpp = NULL; info = rhdefault; /* get our header */ - getheader(inpf, headline, (char *)&info); - if (info.format == FMTBAD | info.expos <= 0. || + getheader(inpf, headline, &info); + if ((info.format == FMTBAD) | (info.expos <= 0.) || fgetresolu(xp, yp, inpf) < 0) { err = TM_E_BADFILE; goto done; } @@ -225,14 +236,20 @@ done: /* clean up */ if (fp == NULL) fclose(inpf); if (scanin != NULL) - free((char *)scanin); - if (err != TM_E_OK) + free((MEM_PTR)scanin); + if (err != TM_E_OK) { + if (*lpp != NULL) + free((MEM_PTR)*lpp); + if (cpp != TM_NOCHROMP && *cpp != NULL) + free((MEM_PTR)*cpp); returnErr(err); + } returnOK; } -int /* run pcond to map picture */ +#ifdef PCOND +static int /* run pcond to map picture */ dopcond(psp, xp, yp, flags, monpri, gamval, Lddyn, Ldmax, fname) BYTE **psp; int *xp, *yp; @@ -242,7 +259,7 @@ double gamval, Lddyn, Ldmax; char *fname; { char *funcName = fname; - char cmdbuf[512]; + char cmdbuf[1024]; FILE *infp; register COLR *scan; register BYTE *rp; @@ -252,26 +269,26 @@ char *fname; if (setcolrcor(pow, 1./gamval) < 0) returnErr(TM_E_NOMEM); /* create command */ - strcpy(cmdbuf, "pcond "); + strcpy(cmdbuf, PCOND); if (flags & TM_F_HCONTR) - strcat(cmdbuf, "-s "); + strcat(cmdbuf, " -s"); if (flags & TM_F_MESOPIC) - strcat(cmdbuf, "-c "); + strcat(cmdbuf, " -c"); if (flags & TM_F_LINEAR) - strcat(cmdbuf, "-l "); + strcat(cmdbuf, " -l"); if (flags & TM_F_ACUITY) - strcat(cmdbuf, "-a "); + strcat(cmdbuf, " -a"); if (flags & TM_F_VEIL) - strcat(cmdbuf, "-v "); + strcat(cmdbuf, " -v"); if (flags & TM_F_CWEIGHT) - strcat(cmdbuf, "-w "); - sprintf(cmdbuf+strlen(cmdbuf), - "-p %f %f %f %f %f %f %f %f -d %f -u %f %s", - monpri[RED][CIEX], monpri[RED][CIEY], - monpri[GRN][CIEX], monpri[GRN][CIEY], - monpri[BLU][CIEX], monpri[BLU][CIEY], - monpri[WHT][CIEX], monpri[WHT][CIEY], - Lddyn, Ldmax, fname); + strcat(cmdbuf, " -w"); + if (monpri != stdprims) + sprintf(cmdbuf+strlen(cmdbuf), " -p %f %f %f %f %f %f %f %f", + monpri[RED][CIEX], monpri[RED][CIEY], + monpri[GRN][CIEX], monpri[GRN][CIEY], + monpri[BLU][CIEX], monpri[BLU][CIEY], + monpri[WHT][CIEX], monpri[WHT][CIEY]); + sprintf(cmdbuf+strlen(cmdbuf), " -d %f -u %f %s", Lddyn, Ldmax, fname); /* start pcond */ if ((infp = popen(cmdbuf, "r")) == NULL) returnErr(TM_E_BADFILE); @@ -287,7 +304,7 @@ char *fname; rp = (BYTE *)malloc(sizeof(BYTE) * *xp * *yp); else rp = (BYTE *)malloc(3*sizeof(BYTE) * *xp * *yp); - if ((*psp = rp) == NULL | scan == NULL) { + if (((*psp = rp) == NULL) | (scan == NULL)) { pclose(infp); returnErr(TM_E_NOMEM); } @@ -295,8 +312,8 @@ char *fname; for (y = 0; y < *yp; y++) { if (freadcolrs(scan, *xp, infp) < 0) { pclose(infp); - free((char *)scan); - free((char *)*psp); + free((MEM_PTR)scan); + free((MEM_PTR)*psp); *psp = NULL; returnErr(TM_E_BADFILE); } @@ -311,10 +328,11 @@ char *fname; *rp++ = scan[x][BLU]; } } - free((char *)scan); + free((MEM_PTR)scan); pclose(infp); returnOK; } +#endif int /* map a Radiance picture */ @@ -328,23 +346,24 @@ char *fname; FILE *fp; { char *funcName = fname==NULL ? "tmMapPicture" : fname; - FILE *inpf; BYTE *cp; TMbright *lp; int err; /* check arguments */ - if (psp == NULL | xp == NULL | yp == NULL | monpri == NULL | - (fname == NULL & fp == TM_GETFILE)) + if ((psp == NULL) | (xp == NULL) | (yp == NULL) | (monpri == NULL) | + ((fname == NULL) & (fp == TM_GETFILE))) returnErr(TM_E_ILLEGAL); /* set defaults */ if (gamval < MINGAM) gamval = DEFGAM; if (Lddyn < MINLDDYN) Lddyn = DEFLDDYN; if (Ldmax < MINLDMAX) Ldmax = DEFLDMAX; if (flags & TM_F_BW) monpri = stdprims; +#ifdef PCOND /* check for pcond run */ if (fp == TM_GETFILE && flags & TM_F_UNIMPL) return( dopcond(psp, xp, yp, flags, monpri, gamval, Lddyn, Ldmax, fname) ); +#endif /* initialize tone mapping */ if (tmInit(flags, monpri, gamval) == NULL) returnErr(TM_E_NOMEM); @@ -359,7 +378,7 @@ FILE *fp; if (flags & TM_F_BW) { *psp = (BYTE *)malloc(sizeof(BYTE) * *xp * *yp); if (*psp == NULL) { - free((char *)lp); + free((MEM_PTR)lp); tmDone(NULL); returnErr(TM_E_NOMEM); } @@ -377,10 +396,10 @@ FILE *fp; err = tmMapPixels(*psp, lp, cp, *xp * *yp); done: /* clean up */ - free((char *)lp); + free((MEM_PTR)lp); tmDone(NULL); if (err != TM_E_OK) { /* free memory on error */ - free((char *)*psp); + free((MEM_PTR)*psp); *psp = NULL; returnErr(err); }