--- ray/src/cv/rad2mgf.c 2003/02/22 02:07:23 2.16 +++ ray/src/cv/rad2mgf.c 2003/07/27 22:12:02 2.18 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rad2mgf.c,v 2.16 2003/02/22 02:07:23 greg Exp $"; +static const char RCSid[] = "$Id: rad2mgf.c,v 2.18 2003/07/27 22:12:02 schorsch Exp $"; #endif /* * Convert Radiance scene description to MGF @@ -8,6 +8,9 @@ static const char RCSid[] = "$Id: rad2mgf.c,v 2.16 200 #include "standard.h" #include #include +#include + +#include "platform.h" #include "object.h" #include "color.h" #include "lookup.h" @@ -260,7 +263,7 @@ char *id; *cp2++ = 'O'; } for (cp = id; cp < end; *cp2++ = *cp++) { - if (*cp < '!' | *cp > '~') /* limit to visible chars */ + if ((*cp < '!') | (*cp > '~')) /* limit to visible chars */ *cp = '?'; diff += *cp != *cp2; } @@ -425,7 +428,7 @@ FUNARGS *fa; register char *cp; register int i; - if (fa->nfargs < 9 | fa->nfargs % 3) + if ((fa->nfargs < 9) | (fa->nfargs % 3)) return(-1); setmat(mod); setobj(id);