--- ray/src/common/tmaptiff.h	2003/02/25 02:47:22	3.2
+++ ray/src/common/tmaptiff.h	2005/01/07 20:33:02	3.5
@@ -1,4 +1,4 @@
-/* RCSid $Id: tmaptiff.h,v 3.2 2003/02/25 02:47:22 greg Exp $ */
+/* RCSid $Id: tmaptiff.h,v 3.5 2005/01/07 20:33:02 greg Exp $ */
 /*
  *  tmaptiff.h
  *
@@ -6,35 +6,26 @@
  *  Include after "tiffio.h" and "tonemap.h".
  *
  */
-
-#include "copyright.h"
-
+#ifndef _RAD_TMAPTIFF_H_
+#define _RAD_TMAPTIFF_H_
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifdef NOPROTO
-
-extern int	tmCvL16();
-extern int	tmCvLuv24();
-extern int	tmCvLuv32();
-extern int	tmLoadTIFF();
-extern int	tmMapTIFF();
-
-#else
-
-extern int	tmCvL16(TMbright *ls, uint16 *luvs, int len);
-extern int	tmCvLuv24(TMbright *ls, BYTE *cs, uint32 *luvs, int len);
-extern int	tmCvLuv32(TMbright *ls, BYTE *cs, uint32 *luvs, int len);
-extern int	tmLoadTIFF(TMbright **lpp, BYTE **cpp, int *xp, int *yp,
-				char *fname, TIFF *tp);
-extern int	tmMapTIFF(BYTE **psp, int *xp, int *yp, int flags,
-				RGBPRIMP monpri, double gamval,
+extern int	tmCvL16(TMstruct *tms, TMbright *ls, uint16 *luvs, int len);
+extern int	tmCvLuv24(TMstruct *tms, TMbright *ls, BYTE *cs,
+				uint32 *luvs, int len);
+extern int	tmCvLuv32(TMstruct *tms, TMbright *ls, BYTE *cs,
+				uint32 *luvs, int len);
+extern int	tmLoadTIFF(TMstruct *tms, TMbright **lpp, BYTE **cpp,
+				int *xp, int *yp, char *fname, TIFF *tp);
+extern int	tmMapTIFF(BYTE **psp, int *xp, int *yp,
+				int flags, RGBPRIMP monpri, double gamval,
 				double Lddyn, double Ldmax,
 				char *fname, TIFF *tp);
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif
+#endif /* _RAD_TMAPTIFF_H_ */
+