--- ray/src/cv/obj2rad.c	2003/04/23 00:52:33	2.19
+++ ray/src/cv/obj2rad.c	2003/07/27 22:12:02	2.21
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: obj2rad.c,v 2.19 2003/04/23 00:52:33 greg Exp $";
+static const char	RCSid[] = "$Id: obj2rad.c,v 2.21 2003/07/27 22:12:02 schorsch Exp $";
 #endif
 /*
  * Convert a Wavefront .obj file to Radiance format.
@@ -29,7 +29,7 @@ FVECT	*vlist;			/* our vertex list */
 int	nvs;			/* number of vertices in our list */
 FVECT	*vnlist;		/* vertex normal list */
 int	nvns;
-FLOAT	(*vtlist)[2];		/* map vertex list */
+RREAL	(*vtlist)[2];		/* map vertex list */
 int	nvts;
 
 typedef int	VNDX[3];	/* vertex index (point,map,normal) */
@@ -100,7 +100,7 @@ char	*argv[];
 		default:
 			goto userr;
 		}
-	if (i > argc | i < argc-1)
+	if ((i > argc) | (i < argc-1))
 		goto userr;
 	if (i == argc)
 		inpfile = "<stdin>";
@@ -137,7 +137,7 @@ FILE	*fp;
 	ID	tmpid;
 	register int	i;
 
-	while (argc = getstmt(argv, fp))
+	while ( (argc = getstmt(argv, fp)) )
 		switch (argv[0][0]) {
 		case 'f':				/* face */
 			if (!argv[0][1])
@@ -188,7 +188,7 @@ FILE	*fp;
 
 	nstats = nunknown = 0;
 					/* scan until EOF */
-	while (argc = getstmt(argv, fp)) {
+	while ( (argc = getstmt(argv, fp)) ) {
 		switch (argv[0][0]) {
 		case 'v':		/* vertex */
 			switch (argv[0][1]) {
@@ -357,7 +357,7 @@ getonm()				/* invent a good name for object */
 		cp2 = group[i];
 		if (cp1 > name)
 			*cp1++ = '.';
-		while (*cp1 = *cp2++)
+		while ( (*cp1 = *cp2++) )
 			if (++cp1 >= name+sizeof(name)-2) {
 				*cp1 = '\0';
 				return(name);
@@ -470,7 +470,7 @@ register int	ac;
 register char	**av;
 {
 	VNDX	vi;
-	FLOAT	*p0, *p1;
+	RREAL	*p0, *p1;
 	FVECT	v1, v2, nsum, newn;
 	double	d;
 	register int	i;
@@ -555,7 +555,7 @@ char	*v1, *v2, *v3;
 	char	*mod;
 	VNDX	v1i, v2i, v3i;
 	BARYCCM	bvecs;
-	FLOAT	bcoor[3][3];
+	RREAL	bcoor[3][3];
 	int	texOK, patOK;
 	int	flatness;
 	register int	i;
@@ -712,10 +712,10 @@ double	x, y;
 {
 	if (!(nvts%CHUNKSIZ)) {		/* allocate next block */
 		if (nvts == 0)
-			vtlist = (FLOAT (*)[2])malloc(CHUNKSIZ*2*sizeof(FLOAT));
+			vtlist = (RREAL (*)[2])malloc(CHUNKSIZ*2*sizeof(RREAL));
 		else
-			vtlist = (FLOAT (*)[2])realloc((void *)vtlist,
-					(nvts+CHUNKSIZ)*2*sizeof(FLOAT));
+			vtlist = (RREAL (*)[2])realloc((void *)vtlist,
+					(nvts+CHUNKSIZ)*2*sizeof(RREAL));
 		if (vtlist == NULL) {
 			fprintf(stderr,
 			"Out of memory while allocating texture vertex %d\n",