--- ray/src/rt/data.h	1996/02/15 18:46:56	2.3
+++ ray/src/rt/data.h	2003/02/25 02:47:22	2.5
@@ -1,11 +1,10 @@
-/* Copyright (c) 1996 Regents of the University of California */
-
-/* SCCSid "$SunId$ LBL" */
-
+/* RCSid $Id: data.h,v 2.5 2003/02/25 02:47:22 greg Exp $ */
 /*
- *  data.h - header file for routines which interpolate data.
+ * Header for data file loading and computation routines.
  */
 
+#include "copyright.h"
+
 #define  MAXDDIM	5		/* maximum data dimensions */
 
 #define  DATATYPE	float		/* single precision to save space */
@@ -27,6 +26,18 @@ typedef struct datarray {
 	struct datarray  *next;		/* next array in list */
 } DATARRAY;			/* a data array */
 
-extern DATARRAY  *getdata(), *getpict();
+#ifdef NOPROTO
 
-extern double  datavalue();
+extern DATARRAY	*getdata();
+extern DATARRAY	*getpict();
+extern void	freedata();
+extern double	datavalue();
+
+#else
+
+extern DATARRAY	*getdata(char *dname);
+extern DATARRAY	*getpict(char *pname);
+extern void	freedata(DATARRAY *dta);
+extern double	datavalue(DATARRAY *dp, double *pt);
+
+#endif