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

Comparing ray/src/hd/genrhgrid.c (file contents):
Revision 3.2 by greg, Sat Feb 22 02:07:24 2003 UTC vs.
Revision 3.5 by schorsch, Sun Jul 27 22:12:02 2003 UTC

# Line 20 | 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 41 | Line 41 | gridsect(fname, sect)          /* get specified section(s) and
41   char    *fname;
42   int     sect;
43   {
44 –        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 63 | Line 62 | int    sect;
62          for (n = 0; nextloc > 0L; n++) {        /* get the section(s) */
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 (old)
> Changed lines (new)