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.15 by greg, Mon Oct 20 16:01:55 2003 UTC vs.
Revision 3.21 by greg, Mon Oct 21 18:19:32 2019 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7  
8   #include <string.h>
9  
10 – #include "rholo.h"
10   #include "platform.h"
11 < #include "view.h"
11 > #include "rterror.h"
12 > #include "rholo.h"
13  
14   char    *progname;              /* our program name */
15   char    *hdkfile;               /* holodeck file name */
# Line 31 | 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 125 | 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 166 | 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 >        PACKHEAD        *bl,
186 >        int     nb
187 > )
188   {
189 <        extern void     pixBeam();
190 <        register HDBEAMI        *bil;
175 <        register int    i;
189 >        HDBEAMI *bil;
190 >        int     i;
191  
192          if (nb <= 0) return;
193          if ((bil = (HDBEAMI *)malloc(nb*sizeof(HDBEAMI))) == NULL)
# Line 187 | 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 199 | Line 216 | int    fn;
216                                  /* prepare output */
217          if (outspec != NULL) {
218                  sprintf(fname, outspec, fn);
219 <                if (freopen(fname, "w", stdout) == NULL) {
219 >                if (freopen(fname, "wb", stdout) == NULL) {
220                          sprintf(errmsg, "cannot open output \"%s\"", fname);
221                          error(SYSTEM, errmsg);
222                  }
# Line 228 | 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;
253 <        register int32  p;
254 <        register double d;
253 >        int32   p;
254 >        double  d;
255                                  /* compute final pixel values */
256          for (p = hres*vres; p--; ) {
257                  if (myweight[p] <= FTINY) {
# Line 262 | 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;
287          int     n;
288 <        int32   nextloc;
288 >        off_t   nextloc;
289                                          /* open holodeck file */
290 <        if ((fp = fopen(hdkfile, "r")) == NULL) {
290 >        if ((fp = fopen(hdkfile, "rb")) == NULL) {
291                  sprintf(errmsg, "cannot open \"%s\" for reading", hdkfile);
292                  error(SYSTEM, errmsg);
293          }
# Line 285 | 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, SEEK_SET);
306 >                lseek(fd, nextloc, SEEK_SET);
307                  read(fd, (char *)&nextloc, sizeof(nextloc));
308                  hdinit(fd, NULL);
309          }
# Line 300 | Line 318 | initialize()                   /* initialize holodeck and buffers */
318  
319   void
320   eputs(s)                        /* put error message to stderr */
321 < register char  *s;
321 > char  *s;
322   {
323          static int  midline = 0;
324  

Diff Legend

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