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.15 by greg, Fri Mar 14 21:27:46 2003 UTC vs.
Revision 2.26 by greg, Tue Sep 14 02:53:50 2004 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7  
8   #include "copyright.h"
9  
10 < #include  "standard.h"
10 > #include  <stdio.h>
11 > #include  <time.h>
12  
13 + #include  "platform.h"
14 + #include  "rtprocess.h"
15 + #include  "standard.h"
16   #include  "octree.h"
13 –
17   #include  "object.h"
15 –
18   #include  "otypes.h"
19 + #include  "resolu.h"
20  
21 < static double  ogetflt();
22 < static long  ogetint();
23 < static char  *ogetstr();
24 < static int  nonsurfinset();
22 < static int  octerror(), skiptree();
23 < static OCTREE  getfullnode(), gettree();
21 > #ifdef getc_unlocked            /* avoid horrendous overhead of flockfile */
22 > #undef getc
23 > #define getc    getc_unlocked
24 > #endif
25  
26 + static double  ogetflt(void);
27 + static long  ogetint(int);
28 + static char  *ogetstr(char *);
29 + static int  nonsurfinset(OBJECT *);
30 + static void  octerror(int  etyp, char  *msg);
31 + static void  skiptree(void);
32 + static OCTREE  getfullnode(void), gettree(void);
33 +
34   static char  *infn;                     /* input file specification */
35   static FILE  *infp;                     /* input file stream */
36   static int  objsize;                    /* size of stored OBJECT's */
# Line 58 | Line 67 | char  *ofn[];
67                          error(SYSTEM, errmsg);
68                  }
69          }
70 < #ifdef MSDOS
62 <        setmode(fileno(infp), O_BINARY);
63 < #endif
70 >        SET_FILE_BINARY(infp);
71                                          /* get header */
72          if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : (FILE *)NULL) < 0)
73                  octerror(USER, "not an octree");
# Line 98 | Line 105 | char  *ofn[];
105          else if (load & IO_SCENE && nf == 0)
106                  skiptree();
107                  
108 <        if (load & IO_SCENE)            /* get the scene */
108 >        if (load & IO_SCENE) {          /* get the scene */
109              if (nf == 0) {
110                                          /* load binary scene data */
111                  readscene(infp, objsize);
# Line 111 | Line 118 | char  *ofn[];
118                  if (dosets(nonsurfinset))
119                          octerror(USER, "modifier in tree; octree stale?");
120              }
121 +        }
122                                  /* close the input */
123          if (infn[0] == '!')
124                  pclose(infp);
# Line 199 | Line 207 | gettree()                      /* get a pre-ordered octree */
207          default:
208                  octerror(USER, "damaged octree");
209          }
210 +        return EMPTY; /* pro forma return */
211   }
212  
213  
# Line 217 | Line 226 | register OBJECT  *os;
226   }
227  
228  
229 < static
230 < skiptree()                              /* skip octree on input */
229 > static void
230 > skiptree(void)                          /* skip octree on input */
231   {
232          register int  i;
233          
# Line 242 | Line 251 | skiptree()                             /* skip octree on input */
251   }
252  
253  
254 < static
254 > static void
255   octerror(etyp, msg)                     /* octree error */
256   int  etyp;
257   char  *msg;

Diff Legend

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