--- ray/src/common/image.c	2003/02/25 02:47:21	2.17
+++ ray/src/common/image.c	2003/11/14 17:22:06	2.22
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: image.c,v 2.17 2003/02/25 02:47:21 greg Exp $";
+static const char	RCSid[] = "$Id: image.c,v 2.22 2003/11/14 17:22:06 schorsch Exp $";
 #endif
 /*
  *  image.c - routines for image generation.
@@ -9,11 +9,9 @@ static const char	RCSid[] = "$Id: image.c,v 2.17 2003/
 
 #include "copyright.h"
 
-#include  "standard.h"
-
+#include  "rtio.h"
 #include  "view.h"
 
-#include  "paths.h"
 
 #define  FEQ(x,y)	(fabs((x)-(y)) <= FTINY)
 #define  VEQ(v,w)	(FEQ((v)[0],(w)[0]) && FEQ((v)[1],(w)[1]) \
@@ -271,7 +269,7 @@ FVECT  p;
 
 void
 pix2loc(loc, rp, px, py)	/* compute image location from pixel pos. */
-FLOAT  loc[2];
+RREAL  loc[2];
 register RESOLU  *rp;
 int  px, py;
 {
@@ -394,12 +392,15 @@ register char  *s;
 	int  na;
 	int  nvopts = 0;
 
+	while (*s == ' ')
+		s++;
 	if (*s != '-')
 		s = sskip2(s,1);
 	while (*s) {
 		ac = 0;
 		do {
-			av[ac++] = s;
+			if (ac || *s == '-')
+				av[ac++] = s;
 			while (*s && *s != ' ')
 				s++;
 			while (*s == ' ')