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.14 by schorsch, Mon Oct 27 10:24:51 2003 UTC vs.
Revision 2.15 by schorsch, Mon Nov 10 12:28:56 2003 UTC

# Line 18 | Line 18 | static const char      RCSid[] = "$Id$";
18  
19   #define  ASPECT         (120./144.)     /* pixel aspect ratio */
20  
21 < #define  FILTER         "pfilt -1 -x %d -y %d -p %f %s",NCOLS,NROWS,ASPECT
21 > #define  FILTER         "pfilt -1 -x %d -y %d -p %f",NCOLS,NROWS,ASPECT
22 > #define  FILTER_F       "pfilt -1 -x %d -y %d -p %f \"%s\"",NCOLS,NROWS,ASPECT
23  
24   /*
25   *  Subtractive primaries are ordered:  Yellow, Magenta, Cyan.
# Line 55 | Line 56 | char  *argv[];
56   printp(fname)                           /* print a picture */
57   char  *fname;
58   {
59 <        char  buf[64];
59 >        char  buf[PATH_MAX];
60          FILE  *input;
61          int  xres, yres;
62          COLR  scanline[NCOLS];
# Line 63 | Line 64 | char  *fname;
64  
65          if (dofilter) {
66                  if (fname == NULL) {
67 <                        sprintf(buf, FILTER, "");
67 >                        sprintf(buf, FILTER);
68                          fname = "<stdin>";
69                  } else
70 <                        sprintf(buf, FILTER, fname);
70 >                        sprintf(buf, FILTER_F, fname);
71                  if ((input = popen(buf, "r")) == NULL) {
72                          fprintf(stderr, "Cannot execute: %s\n", buf);
73                          return(-1);

Diff Legend

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