--- ray/src/common/view.h	2003/06/06 16:38:47	2.9
+++ ray/src/common/view.h	2004/06/08 19:48:29	2.16
@@ -1,20 +1,19 @@
-/* RCSid $Id: view.h,v 2.9 2003/06/06 16:38:47 schorsch Exp $ */
+/* RCSid $Id: view.h,v 2.16 2004/06/08 19:48:29 greg Exp $ */
 /*
  *  view.h - header file for image generation.
  *
- *  Include after fvect.h
+ *  Include after stdio.h and rtmath.h
  *  Includes resolu.h
  */
 #ifndef _RAD_VIEW_H_
 #define _RAD_VIEW_H_
+
+#include  "resolu.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "copyright.h"
-
-#include  "resolu.h"
-
 				/* view types */
 #define  VT_PER		'v'		/* perspective */
 #define  VT_PAR		'l'		/* parallel */
@@ -55,7 +54,7 @@ extern char	*setview(VIEW *v);
 extern void	normaspect(double va, double *ap, int *xp, int *yp);
 extern double	viewray(FVECT orig, FVECT direc, VIEW *v, double x, double y);
 extern void	viewloc(FVECT ip, VIEW *v, FVECT p);
-extern void	pix2loc(FLOAT loc[2], RESOLU *rp, int px, int py);
+extern void	pix2loc(RREAL loc[2], RESOLU *rp, int px, int py);
 extern void	loc2pix(int pp[2], RESOLU *rp, double lx, double ly);
 extern int	getviewopt(VIEW *v, int ac, char *av[]);
 extern int	sscanview(VIEW *vp, char *s);