--- ray/src/cv/nff2rad.c	1993/07/20 11:34:40	2.4
+++ ray/src/cv/nff2rad.c	2003/07/27 22:12:01	2.6
@@ -1,9 +1,6 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: nff2rad.c,v 2.6 2003/07/27 22:12:01 schorsch Exp $";
 #endif
-
 /*
  * Convert Neutral File Format input to Radiance scene description.
  *
@@ -430,7 +427,7 @@ cone()
 				progname);
 		exit(1);
 	}
-	if (invert = r0 < 0.) {
+	if ( (invert = r0 < 0.) ) {
 		r0 = -r0;
 		r1 = -r1;
 	}
@@ -547,12 +544,17 @@ fmterr:
 	exit(1);
 }
 /***********************************************************************
- * $Author: greg $ (Mark VandeWettering, drizzle.cs.uoregon.edu)
- * $Revision: 2.4 $
- * $Date: 1993/07/20 11:34:40 $
+ * $Author: schorsch $ (Mark VandeWettering, drizzle.cs.uoregon.edu)
+ * $Revision: 2.6 $
+ * $Date: 2003/07/27 22:12:01 $
  * $Log: nff2rad.c,v $
- * Revision 2.4  1993/07/20 11:34:40  greg
- * fixes in materials and light sources (hacks all)
+ * Revision 2.6  2003/07/27 22:12:01  schorsch
+ * Added grouping parens to reduce ambiguity warnings.
+ *
+ * Revision 2.5  2003/02/22 02:07:23  greg
+ * Changes and check-in for 3.5 release
+ * Includes new source files and modifications not recorded for many years
+ * See ray/doc/notes/ReleaseNotes for notes between 3.1 and 3.5 release
  *
  * Revision 1.2  88/09/12  12:53:47  markv
  * Fixed problem in LookupColorbyName, had return ; and return(0).