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

Comparing ray/src/common/readoct.c (file contents):
Revision 2.16 by schorsch, Thu Jun 5 19:29:34 2003 UTC vs.
Revision 2.21 by schorsch, Mon Jul 21 22:30:17 2003 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  "standard.h"
14 + #include  "platform.h"
15   #include  "octree.h"
13 –
16   #include  "object.h"
15 –
17   #include  "otypes.h"
18 + #include  "resolu.h"
19  
20 < static double  ogetflt();
21 < static long  ogetint();
22 < static char  *ogetstr();
23 < static int  nonsurfinset();
24 < static int  octerror(), skiptree();
25 < static OCTREE  getfullnode(), gettree();
20 > static double  ogetflt(void);
21 > static long  ogetint(int);
22 > static char  *ogetstr(char *);
23 > static int  nonsurfinset(OBJECT *);
24 > static void  octerror(int  etyp, char  *msg);
25 > static void  skiptree(void);
26 > static OCTREE  getfullnode(void), gettree(void);
27  
28   static char  *infn;                     /* input file specification */
29   static FILE  *infp;                     /* input file stream */
# Line 96 | Line 99 | char  *ofn[];
99          else if (load & IO_SCENE && nf == 0)
100                  skiptree();
101                  
102 <        if (load & IO_SCENE)            /* get the scene */
102 >        if (load & IO_SCENE) {          /* get the scene */
103              if (nf == 0) {
104                                          /* load binary scene data */
105                  readscene(infp, objsize);
# Line 109 | Line 112 | char  *ofn[];
112                  if (dosets(nonsurfinset))
113                          octerror(USER, "modifier in tree; octree stale?");
114              }
115 +        }
116                                  /* close the input */
117          if (infn[0] == '!')
118                  pclose(infp);
# Line 197 | Line 201 | gettree()                      /* get a pre-ordered octree */
201          default:
202                  octerror(USER, "damaged octree");
203          }
204 +        return NULL; /* pro forma return */
205   }
206  
207  
# Line 215 | Line 220 | register OBJECT  *os;
220   }
221  
222  
223 < static
224 < skiptree()                              /* skip octree on input */
223 > static void
224 > skiptree(void)                          /* skip octree on input */
225   {
226          register int  i;
227          
# Line 240 | Line 245 | skiptree()                             /* skip octree on input */
245   }
246  
247  
248 < static
248 > static void
249   octerror(etyp, msg)                     /* octree error */
250   int  etyp;
251   char  *msg;

Diff Legend

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