ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/cv/mgflib/mgf2inv.c
(Generate patch)

Comparing ray/src/cv/mgflib/mgf2inv.c (file contents):
Revision 1.7 by gregl, Thu May 22 08:41:04 1997 UTC vs.
Revision 1.9 by schorsch, Sun Jul 27 22:12:02 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1995 Regents of the University of California */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   * Convert MGF to Inventor file.
6   *
# Line 12 | Line 9 | static char SCCSid[] = "$SunId$ LBL";
9  
10   #include <stdio.h>
11  
12 + #include <stdlib.h>
13 +
14   #include <math.h>
15  
16   #include <ctype.h>
# Line 460 | Line 459 | char   **av;
459          if (put_material() < 0)
460                  return(MG_EBADMAT);
461                                  /* get endpoints */
462 <        if ((v1 = c_getvert(av[1])) == NULL | (v2 = c_getvert(av[3])) == NULL)
462 >        if (((v1 = c_getvert(av[1])) == NULL) | ((v2 = c_getvert(av[3])) == NULL))
463                  return(MG_EUNDEF);
464                                  /* get radius */
465          if (!isflt(av[2]))

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines