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

Comparing ray/src/px/oki20.c (file contents):
Revision 2.9 by greg, Sat Feb 22 02:07:27 2003 UTC vs.
Revision 2.12 by schorsch, Mon Nov 10 12:28:56 2003 UTC

# Line 6 | Line 6 | static const char      RCSid[] = "$Id$";
6   */
7  
8   #include  <stdio.h>
9 – #ifdef MSDOS
10 – #include  <fcntl.h>
11 – #endif
9   #include  <time.h>
10  
11 + #include  "platform.h"
12 + #include  "rtprocess.h"
13   #include  "color.h"
14   #include  "resolu.h"
15  
# Line 19 | 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   long  lpat[NCOLS];
25  
26   int  dofilter = 0;              /* filter through pfilt first? */
27  
28 – extern FILE  *popen();
28  
30 –
29   main(argc, argv)
30   int  argc;
31   char  *argv[];
32   {
33          int  i, status = 0;
34 < #ifdef MSDOS
35 <        extern int  _fmode;
36 <        _fmode = O_BINARY;
39 <        setmode(fileno(stdin), O_BINARY);
40 <        setmode(fileno(stdout), O_BINARY);
41 < #endif
34 >        SET_DEFAULT_BINARY();
35 >        SET_FILE_BINARY(stdin);
36 >        SET_FILE_BINARY(stdout);
37          if (argc > 1 && !strcmp(argv[1], "-p")) {
38                  dofilter++;
39                  argv++; argc--;
# Line 55 | Line 50 | char  *argv[];
50   printp(fname)                           /* print a picture */
51   char  *fname;
52   {
53 <        char  buf[64];
53 >        char  buf[PATH_MAX];
54          FILE  *input;
55          int  xres, yres;
56          COLR  scanline[NCOLS];
# Line 63 | Line 58 | char  *fname;
58  
59          if (dofilter) {
60                  if (fname == NULL) {
61 <                        sprintf(buf, FILTER, "");
61 >                        sprintf(buf, FILTER);
62                          fname = "<stdin>";
63                  } else
64 <                        sprintf(buf, FILTER, fname);
64 >                        sprintf(buf, FILTER_F, fname);
65                  if ((input = popen(buf, "r")) == NULL) {
66                          fprintf(stderr, "Cannot execute: %s\n", buf);
67                          return(-1);

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)