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.20 by schorsch, Thu Jul 17 09:21:29 2003 UTC vs.
Revision 2.25 by greg, Thu Apr 29 14:36:49 2004 UTC

# Line 10 | Line 10 | static const char      RCSid[] = "$Id$";
10   #include  <stdio.h>
11   #include  <time.h>
12  
13 – #include  "standard.h"
13   #include  "platform.h"
14 + #include  "rtprocess.h"
15 + #include  "standard.h"
16   #include  "octree.h"
17   #include  "object.h"
18   #include  "otypes.h"
19   #include  "resolu.h"
20  
21 + #ifdef getc_unlocked            /* avoid horrendous overhead of flockfile */
22 + #define getc    getc_unlocked
23 + #endif
24 +
25   static double  ogetflt(void);
26   static long  ogetint(int);
27   static char  *ogetstr(char *);
# Line 99 | Line 104 | char  *ofn[];
104          else if (load & IO_SCENE && nf == 0)
105                  skiptree();
106                  
107 <        if (load & IO_SCENE)            /* get the scene */
107 >        if (load & IO_SCENE) {          /* get the scene */
108              if (nf == 0) {
109                                          /* load binary scene data */
110                  readscene(infp, objsize);
# Line 112 | Line 117 | char  *ofn[];
117                  if (dosets(nonsurfinset))
118                          octerror(USER, "modifier in tree; octree stale?");
119              }
120 +        }
121                                  /* close the input */
122          if (infn[0] == '!')
123                  pclose(infp);
# Line 200 | Line 206 | gettree()                      /* get a pre-ordered octree */
206          default:
207                  octerror(USER, "damaged octree");
208          }
209 <        return NULL; /* pro forma return */
209 >        return EMPTY; /* pro forma return */
210   }
211  
212  

Diff Legend

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