--- ray/src/common/tmapcolrs.c 2005/10/24 04:25:01 3.22 +++ ray/src/common/tmapcolrs.c 2011/05/20 02:06:38 3.29 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: tmapcolrs.c,v 3.22 2005/10/24 04:25:01 greg Exp $"; +static const char RCSid[] = "$Id: tmapcolrs.c,v 3.29 2011/05/20 02:06:38 greg Exp $"; #endif /* * Routines for tone mapping on Radiance RGBE and XYZE pictures. @@ -10,20 +10,21 @@ static const char RCSid[] = "$Id: tmapcolrs.c,v 3.22 2 #include "copyright.h" #include +#include #include #include #include -#include "tmprivat.h" -#include "resolu.h" #ifdef PCOND #include "rtprocess.h" #endif +#include "tmprivat.h" +#include "resolu.h" -#define GAMTSZ 1024 +#define GAMTSZ 4096 typedef struct { - BYTE gamb[GAMTSZ]; /* gamma lookup table */ + uby8 gamb[GAMTSZ]; /* gamma lookup table */ int clfb[3]; /* encoded tm->clf */ int32 cmatb[3][3]; /* encoded color transform */ TMbright inpsfb; /* encoded tm->inpsf */ @@ -38,24 +39,23 @@ static struct tmPackage colrPkg = { /* our package fun }; static int colrReg = -1; /* our package registration number */ -#define LOGISZ 260 -static TMbright logi[LOGISZ]; +static TMbright logi[256]; int tmCvColrs( /* convert RGBE/XYZE colors */ TMstruct *tms, TMbright *ls, -BYTE *cs, +uby8 *cs, COLR *scan, int len ) { static const char funcName[] = "tmCvColrs"; int cmon[4]; - register COLRDATA *cd; - register int i, j, li, bi; - int32 vl; + COLRDATA *cd; + int i, j, bi; + int32 li, vl; if (tms == NULL) returnErr(TM_E_TMINVAL); @@ -67,8 +67,6 @@ int len 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] = 0; tmMkMesofact(); } if ((cd = (COLRDATA *)tmPkgData(tms,colrReg)) == NULL) @@ -86,11 +84,11 @@ int len } else copycolr(cmon, scan[i]); /* world luminance */ - li = cd->clfb[RED]*cmon[RED] + - cd->clfb[GRN]*cmon[GRN] + - cd->clfb[BLU]*cmon[BLU] ; - if (li >= 0xff00) li = 255; - else li >>= 8; + li = cd->clfb[RED]*(int32)cmon[RED] + + cd->clfb[GRN]*(int32)cmon[GRN] + + cd->clfb[BLU]*(int32)cmon[BLU] ; + if (li >= 1L<<(12+8)) li = 255; + else li >>= 12; bi = BRT2SCALE(cmon[EXP]-COLXS) + cd->inpsfb; if (li > 0) bi += logi[li]; @@ -123,11 +121,11 @@ int len for (j = 3; j--; ) if (cmon[j] < 0) cmon[j] = 0; } - bi = ( (int32)GAMTSZ*cd->clfb[RED]*cmon[RED]/li ) >> 8; + bi = ( (uint32)GAMTSZ*cd->clfb[RED]*cmon[RED]/li ) >> 12; cs[3*i ] = bi>=GAMTSZ ? 255 : cd->gamb[bi]; - bi = ( (int32)GAMTSZ*cd->clfb[GRN]*cmon[GRN]/li ) >> 8; + bi = ( (uint32)GAMTSZ*cd->clfb[GRN]*cmon[GRN]/li ) >> 12; cs[3*i+1] = bi>=GAMTSZ ? 255 : cd->gamb[bi]; - bi = ( (int32)GAMTSZ*cd->clfb[BLU]*cmon[BLU]/li ) >> 8; + bi = ( (uint32)GAMTSZ*cd->clfb[BLU]*cmon[BLU]/li ) >> 12; cs[3*i+2] = bi>=GAMTSZ ? 255 : cd->gamb[bi]; } returnOK; @@ -149,12 +147,12 @@ static struct radhead { static int headline( /* grok a header line */ - register char *s, + char *s, void *vrh ) { char fmt[32]; - register struct radhead *rh = vrh; + struct radhead *rh = vrh; if (formatval(fmt, s)) { if (!strcmp(fmt, COLRFMT)) @@ -182,7 +180,7 @@ int tmLoadPicture( /* convert Radiance picture */ TMstruct *tms, TMbright **lpp, -BYTE **cpp, +uby8 **cpp, int *xp, int *yp, char *fname, @@ -226,7 +224,7 @@ FILE *fp if (*lpp == NULL) goto done; if (cpp != TM_NOCHROMP) { - *cpp = (BYTE *)malloc(3*sizeof(BYTE) * *xp * *yp); + *cpp = (uby8 *)malloc(3*sizeof(uby8) * *xp * *yp); if (*cpp == NULL) goto done; } @@ -263,7 +261,7 @@ done: /* clean up */ #ifdef PCOND static int /* run pcond to map picture */ dopcond(psp, xp, yp, flags, monpri, gamval, Lddyn, Ldmax, fname) -BYTE **psp; +uby8 **psp; int *xp, *yp; int flags; RGBPRIMP monpri; @@ -274,10 +272,10 @@ char *fname; TMstruct *tms = NULL; char cmdbuf[1024]; FILE *infp; - register COLR *scan; - register BYTE *rp; + COLR *scan; + uby8 *rp; int y; - register int x; + int x; /* set up gamma correction */ if (setcolrcor(pow, 1./gamval) < 0) returnErr(TM_E_NOMEM); @@ -314,9 +312,9 @@ char *fname; /* allocate arrays */ scan = (COLR *)malloc(sizeof(COLR) * *xp); if (flags & TM_F_BW) - rp = (BYTE *)malloc(sizeof(BYTE) * *xp * *yp); + rp = (uby8 *)malloc(sizeof(uby8) * *xp * *yp); else - rp = (BYTE *)malloc(3*sizeof(BYTE) * *xp * *yp); + rp = (uby8 *)malloc(3*sizeof(uby8) * *xp * *yp); if (((*psp = rp) == NULL) | (scan == NULL)) { pclose(infp); returnErr(TM_E_NOMEM); @@ -350,7 +348,7 @@ char *fname; int /* map a Radiance picture */ tmMapPicture(psp, xp, yp, flags, monpri, gamval, Lddyn, Ldmax, fname, fp) -BYTE **psp; +uby8 **psp; int *xp, *yp; int flags; RGBPRIMP monpri; @@ -360,7 +358,7 @@ FILE *fp; { char *funcName = fname==NULL ? "tmMapPicture" : fname; TMstruct *tms; - BYTE *cp; + uby8 *cp; TMbright *lp; int err; /* check arguments */ @@ -390,7 +388,7 @@ FILE *fp; } /* allocate space for result */ if (flags & TM_F_BW) { - *psp = (BYTE *)malloc(sizeof(BYTE) * *xp * *yp); + *psp = (uby8 *)malloc(sizeof(uby8) * *xp * *yp); if (*psp == NULL) { free((MEM_PTR)lp); tmDone(tms); @@ -423,17 +421,16 @@ done: /* clean up */ static void colrNewSpace(tms) /* color space changed for tone mapping */ -register TMstruct *tms; +TMstruct *tms; { - register COLRDATA *cd; + COLRDATA *cd; double d; int i, j; cd = (COLRDATA *)tms->pd[colrReg]; for (i = 3; i--; ) - cd->clfb[i] = 0x100*tms->clf[i] + .5; - d = TM_BRTSCALE*log(tms->inpsf); - cd->inpsfb = d<0. ? d-.5 : d+.5; + cd->clfb[i] = 0x1000*tms->clf[i] + .5; + cd->inpsfb = tmCvLuminance(tms->inpsf); for (i = 3; i--; ) for (j = 3; j--; ) { d = tms->cmat[i][j] / tms->inpsf; @@ -444,10 +441,10 @@ register TMstruct *tms; static MEM_PTR colrInit(tms) /* initialize private data for tone mapping */ -register TMstruct *tms; +TMstruct *tms; { - register COLRDATA *cd; - register int i; + COLRDATA *cd; + int i; /* allocate our data */ cd = (COLRDATA *)malloc(sizeof(COLRDATA)); if (cd == NULL)