--- ray/src/common/tmprivat.h 2005/01/07 20:33:02 3.14 +++ ray/src/common/tmprivat.h 2008/07/03 03:35:10 3.17 @@ -1,4 +1,4 @@ -/* RCSid $Id: tmprivat.h,v 3.14 2005/01/07 20:33:02 greg Exp $ */ +/* RCSid $Id: tmprivat.h,v 3.17 2008/07/03 03:35:10 greg Exp $ */ /* * Private header file for tone mapping routines. */ @@ -37,6 +37,9 @@ extern "C" { #define MINBRT (-16*TM_BRTSCALE) /* minimum usable brightness */ #define MINLUM (1.125352e-7) /* tmLuminance(MINBRT) */ +#define HISTI(li) (((li)-MINBRT)/HISTEP) +#define HISTV(i) (MINBRT + HISTEP/2 + (i)*HISTEP) + #define LMESLOWER (5.62e-3) /* lower mesopic limit */ #define LMESUPPER (5.62) /* upper mesopic limit */ #if (TM_BRTSCALE==128) @@ -59,7 +62,7 @@ extern "C" { MEM_PTR malloc(); MEM_PTR calloc(); #endif -extern int tmErrorReturn(char *, TMstruct *, int); +extern int tmErrorReturn(const char *, TMstruct *, int); /* lookup for mesopic scaling */ extern BYTE tmMesofact[BMESUPPER-BMESLOWER];