--- ray/src/rt/rpaint.h	2008/08/21 07:05:59	2.8
+++ ray/src/rt/rpaint.h	2013/11/13 23:45:54	2.11
@@ -1,4 +1,4 @@
-/* RCSid $Id: rpaint.h,v 2.8 2008/08/21 07:05:59 greg Exp $ */
+/* RCSid $Id: rpaint.h,v 2.11 2013/11/13 23:45:54 greg Exp $ */
 /*
  *  rpaint.h - header file for image painting.
  */
@@ -12,6 +12,13 @@
 extern "C" {
 #endif
 
+#ifdef _WIN32		/* stupid Windows name collisions */
+#undef COORD
+#define COORD	radCOORD
+#undef RECT
+#define RECT	radRECT
+#endif
+
 typedef short  COORD;		/* an image coordinate */
 
 typedef struct pnode {
@@ -78,6 +85,7 @@ extern void	getaim(char *s);
 extern void	getmove(char *s);
 extern void	getrotate(char *s);
 extern void	getpivot(char *s);
+extern void	getorigin(char *s);
 extern void	getexposure(char *s);
 extern int	getparam(char *str, char *dsc, int typ, void *p);
 extern void	setparam(char *s);
@@ -94,6 +102,7 @@ extern void	redraw(void);
 extern void	repaint(int xmin, int ymin, int xmax, int ymax);
 extern void	paintrect(PNODE *p, RECT *r);
 extern PNODE	*findrect(int x, int y, PNODE *p, int pd);
+extern void	compavg(PNODE *p);
 extern void	scalepict(PNODE *p, double sf);
 extern void	getpictcolrs(int yoff, COLR *scan, PNODE *p,
 			int xsiz, int ysiz);