--- ray/src/common/tonemap.h	2003/02/22 02:07:22	3.11
+++ ray/src/common/tonemap.h	2003/06/06 16:38:47	3.13
@@ -1,71 +1,18 @@
-/* RCSid: $Id: tonemap.h,v 3.11 2003/02/22 02:07:22 greg Exp $ */
+/* RCSid $Id: tonemap.h,v 3.13 2003/06/06 16:38:47 schorsch Exp $ */
 /*
  * Header file for tone mapping functions.
  *
  * Include after "color.h"
  */
-
-/* ====================================================================
- * The Radiance Software License, Version 1.0
- *
- * Copyright (c) 1990 - 2002 The Regents of the University of California,
- * through Lawrence Berkeley National Laboratory.   All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *         notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *           if any, must include the following acknowledgment:
- *             "This product includes Radiance software
- *                 (http://radsite.lbl.gov/)
- *                 developed by the Lawrence Berkeley National Laboratory
- *               (http://www.lbl.gov/)."
- *       Alternately, this acknowledgment may appear in the software itself,
- *       if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
- *       and "The Regents of the University of California" must
- *       not be used to endorse or promote products derived from this
- *       software without prior written permission. For written
- *       permission, please contact radiance@radsite.lbl.gov.
- *
- * 5. Products derived from this software may not be called "Radiance",
- *       nor may "Radiance" appear in their name, without prior written
- *       permission of Lawrence Berkeley National Laboratory.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
- * information on Lawrence Berkeley National Laboratory, please see
- * <http://www.lbl.gov/>.
- */
-
+#ifndef _RAD_TONEMAP_H_
+#define _RAD_TONEMAP_H_
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+
+#include "copyright.h"
+
 /****    Argument Macros    ****/
 				/* Flags of what to do */
 #define	TM_F_HCONTR	01		/* human contrast sensitivity */
@@ -143,19 +90,11 @@ extern struct tmStruct {
 }	*tmTop;			/* current tone mapping stack */
 
 				/* conversion package functions */
-#ifdef	NOPROTO
 struct tmPackage {
-	MEM_PTR		(*Init)();	/* initialize private data */
-	void		(*NewSpace)();	/* new input color space (optional) */
-	void		(*Free)();	/* free private data */
-};
-#else
-struct tmPackage {
 	MEM_PTR		(*Init)(struct tmStruct *tms);
 	void		(*NewSpace)(struct tmStruct *tms);
 	void		(*Free)(MEM_PTR pp);
 };
-#endif
 				/* our list of conversion packages */
 extern struct tmPackage	*tmPkg[TM_MAXPKG];
 extern int	tmNumPkgs;	/* number of registered packages */
@@ -179,18 +118,7 @@ extern int	tmNumPkgs;	/* number of registered packages
 
 /****    Library Function Calls    ****/
 
-#ifdef	NOPROTO
 
-extern struct tmStruct	*tmInit(), *tmPop(), *tmDup();
-extern int	tmSetSpace(), tmPull(), tmPush();
-extern void	tmClearHisto(), tmDone();
-extern int	tmAddHisto();
-extern int	tmFixedMapping(), tmComputeMapping(), tmMapPixels();
-extern int	tmCvColors(), tmCvGrays(), tmCvColrs();
-extern int	tmLoadPicture(), tmMapPicture();
-
-#else
-
 extern struct tmStruct *
 tmInit(int flags, RGBPRIMP monpri, double gamval);
 /*
@@ -404,7 +332,6 @@ tmMapPicture(BYTE **psp, int *xp, int *yp, int flags,
 	returns	-	0 on success, TM_E_* on failure.
 */
 
-#endif
 
 
 /****    Notes    ****/
@@ -481,3 +408,5 @@ tmMapPicture(BYTE **psp, int *xp, int *yp, int flags,
 #ifdef __cplusplus
 }
 #endif
+#endif /* _RAD_TONEMAP_H_ */
+