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

Comparing ray/src/px/oki20.c (file contents):
Revision 2.1 by greg, Sat Apr 11 16:31:07 1992 UTC vs.
Revision 2.3 by greg, Fri Jul 3 08:59:24 1992 UTC

# Line 65 | Line 65 | char  *fname;
65          int  i;
66  
67          if (dofilter) {
68 <                if (fname == NULL)
69 <                        fname = "";
70 <                sprintf(buf, FILTER, fname);
68 >                if (fname == NULL) {
69 >                        sprintf(buf, FILTER, "");
70 >                        fname = "<stdin>";
71 >                } else
72 >                        sprintf(buf, FILTER, fname);
73                  if ((input = popen(buf, "r")) == NULL) {
74                          fprintf(stderr, "Cannot execute: %s\n", buf);
75                          return(-1);
76                  }
75 –                fname = buf;
77          } else if (fname == NULL) {
78                  input = stdin;
79                  fname = "<stdin>";
# Line 90 | Line 91 | char  *fname;
91                  fprintf(stderr, "%s: bad picture size\n", fname);
92                  return(-1);
93          }
94 <        if (xres > NCOLS || yres > NROWS) {
94 >        if (xres > NCOLS) {
95                  fprintf(stderr, "%s: resolution mismatch\n", fname);
96                  return(-1);
97          }

Diff Legend

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