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

Comparing ray/src/hd/rhpict.c (file contents):
Revision 3.7 by gwlarson, Tue Mar 9 15:10:26 1999 UTC vs.
Revision 3.9 by greg, Thu May 29 16:26:22 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1999 Silicon Graphics, Inc. */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ SGI";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   * Radiance holodeck picture generator
6   */
7  
8   #include "rholo.h"
9   #include "view.h"
13 – #include "resolu.h"
10  
11   char    *progname;              /* our program name */
12   char    *hdkfile;               /* holodeck file name */
# Line 147 | Line 143 | int    fn;
143                                          /* render image */
144          if (blist.nb > 0) {
145                  render_frame(blist.bl, blist.nb);
146 <                free((char *)blist.bl);
146 >                free((void *)blist.bl);
147          } else {
148                  sprintf(errmsg, "no section visible in frame %d", fn);
149                  error(WARNING, errmsg);
# Line 184 | Line 180 | int    nb;
180          }
181          hdloadbeams(bil, nb, pixBeam);
182          pixFinish(randfrac);
183 <        free((char *)bil);
183 >        free((void *)bil);
184   }
185  
186  
# Line 264 | Line 260 | endpicture()                   /* finish and write out pixels */
260  
261   initialize()                    /* initialize holodeck and buffers */
262   {
267 –        extern long     ftell();
263          int     fd;
264          FILE    *fp;
265          int     n;
# Line 286 | Line 281 | initialize()                   /* initialize holodeck and buffers */
281          fd = dup(fileno(fp));                   /* dup file descriptor */
282          fclose(fp);                             /* done with stdio */
283          for (n = 0; nextloc > 0L; n++) {        /* initialize each section */
284 <                lseek(fd, (long)nextloc, 0);
284 >                lseek(fd, (off_t)nextloc, 0);
285                  read(fd, (char *)&nextloc, sizeof(nextloc));
286                  hdinit(fd, NULL);
287          }
# Line 299 | Line 294 | initialize()                   /* initialize holodeck and buffers */
294   }
295  
296  
297 + void
298   eputs(s)                        /* put error message to stderr */
299   register char  *s;
300   {

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)