--- ray/src/cv/mgflib/mgf2inv.c 1997/05/22 08:41:04 1.7 +++ ray/src/cv/mgflib/mgf2inv.c 2003/07/27 22:12:02 1.9 @@ -1,9 +1,6 @@ -/* Copyright (c) 1995 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: mgf2inv.c,v 1.9 2003/07/27 22:12:02 schorsch Exp $"; #endif - /* * Convert MGF to Inventor file. * @@ -12,6 +9,8 @@ static char SCCSid[] = "$SunId$ LBL"; #include +#include + #include #include @@ -460,7 +459,7 @@ char **av; if (put_material() < 0) return(MG_EBADMAT); /* get endpoints */ - if ((v1 = c_getvert(av[1])) == NULL | (v2 = c_getvert(av[3])) == NULL) + if (((v1 = c_getvert(av[1])) == NULL) | ((v2 = c_getvert(av[3])) == NULL)) return(MG_EUNDEF); /* get radius */ if (!isflt(av[2]))