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.9 by greg, Mon Sep 21 12:13:38 1992 UTC vs.
Revision 2.15 by schorsch, Mon Nov 10 12:28:56 2003 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1992 Regents of the University of California */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5   *  oki20c.c - program to dump pixel file to OkiMate 20 color printer.
6   */
7  
8   #include  <stdio.h>
9 < #ifdef MSDOS
13 < #include  <fcntl.h>
14 < #endif
9 > #include  <time.h>
10  
11 + #include  "platform.h"
12 + #include  "rtprocess.h"
13   #include  "color.h"
14   #include  "resolu.h"
15  
# Line 21 | Line 18 | static char SCCSid[] = "$SunId$ LBL";
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 33 | Line 31 | long  lpat[NCOLS][3];
31  
32   int  dofilter = 0;              /* filter through pfilt first? */
33  
36 extern FILE  *popen();
34  
38
35   main(argc, argv)
36   int  argc;
37   char  *argv[];
38   {
39          int  i, status = 0;
40 < #ifdef MSDOS
41 <        extern int  _fmode;
42 <        _fmode = O_BINARY;
47 <        setmode(fileno(stdin), O_BINARY);
48 <        setmode(fileno(stdout), O_BINARY);
49 < #endif
40 >        SET_DEFAULT_BINARY();
41 >        SET_FILE_BINARY(stdin);
42 >        SET_FILE_BINARY(stdout);
43          if (argc > 1 && !strcmp(argv[1], "-p")) {
44                  dofilter++;
45                  argv++; argc--;
46          }
54 #ifdef _IOLBF
55        stdout->_flag &= ~_IOLBF;
56 #endif
47          if (argc < 2)
48                  status = printp(NULL) == -1;
49          else
# Line 66 | 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 74 | 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);
# Line 135 | Line 125 | int  y;
125          register long  c;
126          register int  i, j;
127  
128 <        if (bpos = y % 23) {
128 >        if ( (bpos = y % 23) ) {
129  
130                  for (j = 0; j < 3; j++)
131                          for (i = 0; i < len; i++)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines