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

Comparing src/hd/rhpict.c (file contents):
Revision 3.14 by schorsch, Sun Jul 27 22:12:02 2003 UTC vs.
Revision 3.17 by schorsch, Thu Jan 1 11:21:55 2004 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7  
8   #include <string.h>
9  
10 + #include "platform.h"
11 + #include "rterror.h"
12   #include "rholo.h"
13   #include "view.h"
14  
# Line 30 | Line 32 | int    hres, vres;             /* current horizontal and vertical re
32  
33   extern int      nowarn;         /* turn warnings off? */
34  
35 + static void dopicture(int fn);
36 + static void render_frame(PACKHEAD *bl, int nb);
37 + static void startpicture(int fn);
38 + static int endpicture(void);
39 + static void initialize(void);
40 + /* from rhpict2.c */
41 + extern void pixFinish(double ransamp);
42 + extern void pixBeam(BEAM *bp, HDBEAMI *hb);
43  
44 < main(argc, argv)
45 < int     argc;
46 < char    *argv[];
44 >
45 > int
46 > main(
47 > int     argc,
48 > char    *argv[]
49 > )
50   {
51          int     i, rval;
52  
# Line 124 | Line 137 | userr:
137   "Usage: %s [-w][-r rf][-pa pa][-pe ex][-x hr][-y vr][-S stfn][-o outp][view] input.hdk\n",
138                          progname);
139          quit(1);
140 +        return 1;  /* pro forma return */
141   }
142  
143  
144 < dopicture(fn)                   /* render view from holodeck */
145 < int     fn;
144 > static void
145 > dopicture(                      /* render view from holodeck */
146 >        int     fn
147 > )
148   {
149          char    *err;
150          int     rval;
# Line 165 | Line 181 | int    fn;
181   }
182  
183  
184 < render_frame(bl, nb)            /* render frame from beam values */
185 < register PACKHEAD       *bl;
186 < int     nb;
184 > static void
185 > render_frame(           /* render frame from beam values */
186 >        register PACKHEAD       *bl,
187 >        int     nb
188 > )
189   {
172 –        extern void     pixBeam();
190          register HDBEAMI        *bil;
191          register int    i;
192  
# Line 186 | Line 203 | int    nb;
203   }
204  
205  
206 < startpicture(fn)                /* initialize picture for rendering & output */
207 < int     fn;
206 > static void
207 > startpicture(           /* initialize picture for rendering & output */
208 >        int     fn
209 > )
210   {
211          extern char     VersionID[];
212          double  pa = pixaspect;
# Line 227 | Line 246 | int    fn;
246   }
247  
248  
249 < int
250 < endpicture()                    /* finish and write out pixels */
249 > static int
250 > endpicture(void)                        /* finish and write out pixels */
251   {
252          int     lastr = -1, nunrend = 0;
253          int32   lastp, lastrp;
# Line 261 | Line 280 | endpicture()                   /* finish and write out pixels */
280   }
281  
282  
283 < initialize()                    /* initialize holodeck and buffers */
283 > static void
284 > initialize(void)                        /* initialize holodeck and buffers */
285   {
286          int     fd;
287          FILE    *fp;
# Line 284 | Line 304 | initialize()                   /* initialize holodeck and buffers */
304          fd = dup(fileno(fp));                   /* dup file descriptor */
305          fclose(fp);                             /* done with stdio */
306          for (n = 0; nextloc > 0L; n++) {        /* initialize each section */
307 <                lseek(fd, (off_t)nextloc, 0);
307 >                lseek(fd, (off_t)nextloc, SEEK_SET);
308                  read(fd, (char *)&nextloc, sizeof(nextloc));
309                  hdinit(fd, NULL);
310          }

Diff Legend

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