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

Comparing ray/src/ot/oconv.c (file contents):
Revision 2.16 by schorsch, Sun Jun 8 12:03:10 2003 UTC vs.
Revision 2.19 by schorsch, Sat Mar 27 12:41:45 2004 UTC

# Line 7 | Line 7 | static const char RCSid[] = "$Id$";
7   *     7/29/85
8   */
9  
10 #include  "standard.h"
10   #include  "platform.h"
11 + #include  "standard.h"
12   #include  "octree.h"
13   #include  "object.h"
14   #include  "otypes.h"
15   #include  "paths.h"
16 + #include  "resolu.h"
17 + #include  "oconv.h"
18  
19   #define  OMARGIN        (10*FTINY)      /* margin around global cube */
20  
# Line 35 | Line 37 | double mincusize;                      /* minimum cube size from resolu *
37  
38   void  (*addobjnotify[])() = {NULL};     /* new object notifier functions */
39  
40 + static void addobject(CUBE  *cu, OBJECT obj);
41 + static void add2full(CUBE  *cu, OBJECT  obj, int  inc);
42  
43 < main(argc, argv)                /* convert object files to an octree */
44 < int  argc;
45 < char  *argv[];
43 >
44 > int
45 > main(           /* convert object files to an octree */
46 >        int  argc,
47 >        char  *argv[]
48 > )
49   {
50          FVECT  bbmin, bbmax;
51          char  *infile = NULL;
# Line 49 | Line 56 | char  *argv[];
56  
57          progname = argv[0] = fixargv0(argv[0]);
58  
59 <        initotypes();
59 >        ot_initotypes();
60  
61          for (i = 1; i < argc && argv[i][0] == '-'; i++)
62                  switch (argv[i][1]) {
# Line 149 | Line 156 | breakopt:
156          writeoct(outflags, &thescene, ofname);  /* write structures to stdout */
157  
158          quit(0);
159 +        return 0; /* pro forma return */
160   }
161  
162  
163   void
164 < quit(code)                              /* exit program */
165 < int  code;
164 > quit(                           /* exit program */
165 >        int  code
166 > )
167   {
168          exit(code);
169   }
170  
171  
172   void
173 < cputs()                                 /* interactive error */
173 > cputs(void)                                     /* interactive error */
174   {
175          /* referenced, but not used */
176   }
177  
178  
179   void
180 < wputs(s)                                /* warning message */
181 < char  *s;
180 > wputs(                          /* warning message */
181 >        char  *s
182 > )
183   {
184          if (!nowarn)
185                  eputs(s);
# Line 177 | Line 187 | char  *s;
187  
188  
189   void
190 < eputs(s)                                /* put string to stderr */
191 < register char  *s;
190 > eputs(                          /* put string to stderr */
191 >        register char  *s
192 > )
193   {
194          static int  inln = 0;
195  
# Line 191 | Line 202 | register char  *s;
202                  inln = 0;
203   }
204  
205 +                                /* conflicting def's in param.h */
206 + #undef  tstbit
207 + #undef  setbit
208 + #undef  clrbit
209 + #undef  tglbit
210  
211   #define  bitop(f,i,op)          (f[((i)>>3)] op (1<<((i)&7)))
212   #define  tstbit(f,i)            bitop(f,i,&)
# Line 199 | Line 215 | register char  *s;
215   #define  tglbit(f,i)            bitop(f,i,^=)
216  
217  
218 < addobject(cu, obj)                      /* add an object to a cube */
219 < register CUBE  *cu;
220 < OBJECT  obj;
218 > static void
219 > addobject(                      /* add an object to a cube */
220 >        register CUBE  *cu,
221 >        OBJECT  obj
222 > )
223   {
224          int  inc;
225  
# Line 237 | Line 255 | OBJECT obj;
255   }
256  
257  
258 < add2full(cu, obj, inc)                  /* add object to full node */
259 < register CUBE  *cu;
260 < OBJECT  obj;
261 < int  inc;
258 > static void
259 > add2full(                       /* add object to full node */
260 >        register CUBE  *cu,
261 >        OBJECT  obj,
262 >        int  inc
263 > )
264   {
265          OCTREE  ot;
266          OBJECT  oset[MAXSET+1];

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines