ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/common/readoct.c
(Generate patch)

Comparing ray/src/common/readoct.c (file contents):
Revision 2.8 by greg, Mon Jan 25 12:42:39 1993 UTC vs.
Revision 2.11 by greg, Mon Aug 29 14:20:37 1994 UTC

# Line 21 | Line 21 | static char SCCSid[] = "$SunId$ LBL";
21   static double  ogetflt();
22   static long  ogetint();
23   static char  *ogetstr();
24 < static int  getobj(), octerror();
24 > static int  getobj(), octerror(), skiptree();
25   static OCTREE  getfullnode(), gettree();
26  
27   static char  *infn;                     /* input file name */
# Line 38 | Line 38 | int  load;
38   CUBE  *scene;
39   char  *ofn[];
40   {
41 –        extern int  fputs();
41          char  sbuf[512];
42          int  nf;
43          OBJECT  fnobjects;
# Line 60 | Line 59 | char  *ofn[];
59          setmode(fileno(infp), O_BINARY);
60   #endif
61                                          /* get header */
62 <        if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : NULL) < 0)
62 >        if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : (FILE *)NULL) < 0)
63                  octerror(USER, "not an octree");
64                                          /* check format */
65          if ((objsize = ogetint(2)-OCTMAGIC) <= 0 ||

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)