--- ray/src/common/tonemap.h	1997/11/17 13:54:35	3.7
+++ ray/src/common/tonemap.h	1998/10/05 16:49:52	3.9
@@ -1,12 +1,12 @@
-/* Copyright (c) 1997 Regents of the University of California */
+/* Copyright (c) 1998 Silicon Graphics, Inc. */
 
-/* SCCSid "$SunId$ LBL" */
+/* SCCSid "$SunId$ SGI" */
 
 /*
  * Header file for tone mapping functions.
+ *
+ * Include after "color.h"
  */
-				/* required non-system header files */
-#include	"color.h"
 
 
 /****    Argument Macros    ****/
@@ -32,6 +32,7 @@
 #define	TM_NOCHROMP	(BYTE **)NULL	/* indicate no chrominances */
 #define	TM_GETFILE	(FILE *)NULL	/* indicate file must be opened */
 
+
 /****    Error Return Values    ****/
 
 #define TM_E_OK		0		/* normal return status */
@@ -231,7 +232,7 @@ tmLoadPicture(TMbright **lpp, BYTE **cpp, int *xp, int
 	malloc(3), and should be freed with free(3) when no longer needed.
 	Calls tmSetSpace() to calibrate input color space.
 
-	lpp	-	returned array of encoded luminances, English ordering.
+	lpp	-	returned array of encoded luminances, picture ordering.
 	cpp	-	returned array of encoded chrominances (Note 2).
 	xp, yp	-	returned picture dimensions.
 	fname	-	picture file name.
@@ -253,7 +254,7 @@ tmMapPicture(BYTE **psp, int *xp, int *yp, int flags,
 	Memory for the final pixel array is allocated using malloc(3),
 	and should be freed with free(3) when it is no longer needed.
 
-	psp	-	returned array of tone mapped pixels, English ordering.
+	psp	-	returned array of tone mapped pixels, picture ordering.
 	xp, yp	-	returned picture dimensions.
 	flags	-	TM_F_* flags indicating what is to be done.
 	monpri	-	display monitor primaries (Note 1).