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

Comparing ray/src/hd/genrhgrid.c (file contents):
Revision 3.1 by gregl, Tue Jan 6 17:19:42 1998 UTC vs.
Revision 3.5 by schorsch, Sun Jul 27 22:12:02 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1998 Silicon Graphics, Inc. */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ SGI";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   * Generate renderable grids from a holodeck file
6   */
# Line 23 | Line 20 | char   *argv[];
20          int     sect;
21  
22          progname = argv[0];
23 <        if (argc < 5 | argc > 6)
23 >        if ((argc < 5) | (argc > 6))
24                  goto userr;
25          mat = argv[1];
26          name = argv[2];
# Line 44 | Line 41 | gridsect(fname, sect)          /* get specified section(s) and
41   char    *fname;
42   int     sect;
43   {
47 –        extern long     ftell();
44          FILE    *fp;
45          HOLO    hdsect;
46          int     fd;
47 <        int4    nextloc;
47 >        int32   nextloc;
48          int     n;
49                                          /* open holodeck file */
50          if ((fp = fopen(fname, "r")) == NULL) {
# Line 64 | Line 60 | int    sect;
60          nextloc = ftell(fp);                    /* get stdio position */
61          fclose(fp);                             /* done with stdio */
62          for (n = 0; nextloc > 0L; n++) {        /* get the section(s) */
63 <                lseek(fd, (long)nextloc, 0);
63 >                lseek(fd, (off_t)nextloc, 0);
64                  read(fd, (char *)&nextloc, sizeof(nextloc));
65 <                if (sect < 0 | n == sect) {
65 >                if ((sect < 0) | (n == sect)) {
66                          read(fd, (char *)&hdsect, sizeof(HDGRID));
67                          hdcompgrid(&hdsect);
68                          putgrid(&hdsect);       /* print grid */

Diff Legend

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