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.20 by schorsch, Thu Jul 17 09:21:29 2003 UTC vs.
Revision 2.26 by greg, Tue Sep 14 02:53:50 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 + #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 *);
# Line 99 | 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 112 | 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 200 | Line 207 | gettree()                      /* get a pre-ordered octree */
207          default:
208                  octerror(USER, "damaged octree");
209          }
210 <        return NULL; /* pro forma return */
210 >        return EMPTY; /* pro forma return */
211   }
212  
213  

Diff Legend

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