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.24 by schorsch, Mon Oct 27 10:19:31 2003 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"
# Line 99 | Line 100 | char  *ofn[];
100          else if (load & IO_SCENE && nf == 0)
101                  skiptree();
102                  
103 <        if (load & IO_SCENE)            /* get the scene */
103 >        if (load & IO_SCENE) {          /* get the scene */
104              if (nf == 0) {
105                                          /* load binary scene data */
106                  readscene(infp, objsize);
# Line 112 | Line 113 | char  *ofn[];
113                  if (dosets(nonsurfinset))
114                          octerror(USER, "modifier in tree; octree stale?");
115              }
116 +        }
117                                  /* close the input */
118          if (infn[0] == '!')
119                  pclose(infp);
# Line 200 | Line 202 | gettree()                      /* get a pre-ordered octree */
202          default:
203                  octerror(USER, "damaged octree");
204          }
205 <        return NULL; /* pro forma return */
205 >        return EMPTY; /* pro forma return */
206   }
207  
208  

Diff Legend

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