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

Comparing ray/src/hd/rhpict.c (file contents):
Revision 3.13 by schorsch, Mon Jul 21 22:30:18 2003 UTC vs.
Revision 3.18 by greg, Tue Jun 8 19:48:30 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"
11 – #include "view.h"
13  
14   char    *progname;              /* our program name */
15   char    *hdkfile;               /* holodeck file name */
# Line 30 | Line 31 | int    hres, vres;             /* current horizontal and vertical re
31  
32   extern int      nowarn;         /* turn warnings off? */
33  
34 + static void dopicture(int fn);
35 + static void render_frame(PACKHEAD *bl, int nb);
36 + static void startpicture(int fn);
37 + static int endpicture(void);
38 + static void initialize(void);
39 + /* from rhpict2.c */
40 + extern void pixFinish(double ransamp);
41 + extern void pixBeam(BEAM *bp, HDBEAMI *hb);
42  
43 < main(argc, argv)
44 < int     argc;
45 < char    *argv[];
43 >
44 > int
45 > main(
46 > int     argc,
47 > char    *argv[]
48 > )
49   {
50          int     i, rval;
51  
# Line 56 | Line 68 | char   *argv[];
68                                  pixaspect = atof(argv[++i]);
69                          else if (argv[i][2] == 'e') {
70                                  expval = atof(argv[++i]);
71 <                                if (argv[i][0] == '-' | argv[i][0] == '+')
71 >                                if ((argv[i][0] == '-') | (argv[i][0] == '+'))
72                                          expval = pow(2., expval);
73                          } else
74                                  goto userr;
# Line 124 | Line 136 | userr:
136   "Usage: %s [-w][-r rf][-pa pa][-pe ex][-x hr][-y vr][-S stfn][-o outp][view] input.hdk\n",
137                          progname);
138          quit(1);
139 +        return 1;  /* pro forma return */
140   }
141  
142  
143 < dopicture(fn)                   /* render view from holodeck */
144 < int     fn;
143 > static void
144 > dopicture(                      /* render view from holodeck */
145 >        int     fn
146 > )
147   {
148          char    *err;
149          int     rval;
# Line 165 | Line 180 | int    fn;
180   }
181  
182  
183 < render_frame(bl, nb)            /* render frame from beam values */
184 < register PACKHEAD       *bl;
185 < int     nb;
183 > static void
184 > render_frame(           /* render frame from beam values */
185 >        register PACKHEAD       *bl,
186 >        int     nb
187 > )
188   {
172 –        extern void     pixBeam();
189          register HDBEAMI        *bil;
190          register int    i;
191  
# Line 186 | Line 202 | int    nb;
202   }
203  
204  
205 < startpicture(fn)                /* initialize picture for rendering & output */
206 < int     fn;
205 > static void
206 > startpicture(           /* initialize picture for rendering & output */
207 >        int     fn
208 > )
209   {
210          extern char     VersionID[];
211          double  pa = pixaspect;
# Line 212 | Line 230 | int    fn;
230          fputs(VIEWSTR, stdout);
231          fprintview(&myview, stdout);
232          fputc('\n', stdout);
233 <        if (pa < 0.99 | pa > 1.01)
233 >        if ((pa < 0.99) | (pa > 1.01))
234                  fputaspect(pa, stdout);
235 <        if (expval < 0.99 | expval > 1.01)
235 >        if ((expval < 0.99) | (expval > 1.01))
236                  fputexpos(expval, stdout);
237          fputformat(COLRFMT, stdout);
238          fputc('\n', stdout);
# Line 227 | Line 245 | int    fn;
245   }
246  
247  
248 < int
249 < endpicture()                    /* finish and write out pixels */
248 > static int
249 > endpicture(void)                        /* finish and write out pixels */
250   {
251          int     lastr = -1, nunrend = 0;
252          int32   lastp, lastrp;
# Line 261 | Line 279 | endpicture()                   /* finish and write out pixels */
279   }
280  
281  
282 < initialize()                    /* initialize holodeck and buffers */
282 > static void
283 > initialize(void)                        /* initialize holodeck and buffers */
284   {
285          int     fd;
286          FILE    *fp;
# Line 284 | Line 303 | initialize()                   /* initialize holodeck and buffers */
303          fd = dup(fileno(fp));                   /* dup file descriptor */
304          fclose(fp);                             /* done with stdio */
305          for (n = 0; nextloc > 0L; n++) {        /* initialize each section */
306 <                lseek(fd, (off_t)nextloc, 0);
306 >                lseek(fd, (off_t)nextloc, SEEK_SET);
307                  read(fd, (char *)&nextloc, sizeof(nextloc));
308                  hdinit(fd, NULL);
309          }
# Line 292 | Line 311 | initialize()                   /* initialize holodeck and buffers */
311          mypixel = (COLOR *)bmalloc(xres*yres*sizeof(COLOR));
312          myweight = (float *)bmalloc(xres*yres*sizeof(float));
313          mydepth = (float *)bmalloc(xres*yres*sizeof(float));
314 <        if (mypixel == NULL | myweight == NULL | mydepth == NULL)
314 >        if ((mypixel == NULL) | (myweight == NULL) | (mydepth == NULL))
315                  error(SYSTEM, "out of memory in initialize");
316   }
317  

Diff Legend

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