--- ray/src/common/view.h 2003/06/06 16:38:47 2.9 +++ ray/src/common/view.h 2003/06/30 19:04:29 2.12 @@ -1,8 +1,8 @@ -/* RCSid $Id: view.h,v 2.9 2003/06/06 16:38:47 schorsch Exp $ */ +/* RCSid $Id: view.h,v 2.12 2003/06/30 19:04:29 greg Exp $ */ /* * view.h - header file for image generation. * - * Include after fvect.h + * Include after stdio.h and fvect.h * Includes resolu.h */ #ifndef _RAD_VIEW_H_ @@ -11,8 +11,6 @@ extern "C" { #endif -#include "copyright.h" - #include "resolu.h" /* view types */ @@ -55,7 +53,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);