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

Comparing ray/src/px/oki20c.c (file contents):
Revision 2.5 by greg, Sat Apr 11 16:31:32 1992 UTC vs.
Revision 2.7 by greg, Fri Jul 3 08:59:26 1992 UTC

# Line 71 | Line 71 | char  *fname;
71          int  i;
72  
73          if (dofilter) {
74 <                if (fname == NULL)
75 <                        fname = "";
76 <                sprintf(buf, FILTER, fname);
74 >                if (fname == NULL) {
75 >                        sprintf(buf, FILTER, "");
76 >                        fname = "<stdin>";
77 >                } else
78 >                        sprintf(buf, FILTER, fname);
79                  if ((input = popen(buf, "r")) == NULL) {
80                          fprintf(stderr, "Cannot execute: %s\n", buf);
81                          return(-1);
82                  }
81 –                fname = buf;
83          } else if (fname == NULL) {
84                  input = stdin;
85                  fname = "<stdin>";
# Line 96 | Line 97 | char  *fname;
97                  fprintf(stderr, "%s: bad picture size\n", fname);
98                  return(-1);
99          }
100 <        if (xres > NCOLS || yres > NROWS) {
100 >        if (xres > NCOLS) {
101                  fprintf(stderr, "%s: resolution mismatch\n", fname);
102                  return(-1);
103          }

Diff Legend

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