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.5 by greg, Fri Jul 3 10:46:27 1992 UTC vs.
Revision 2.10 by schorsch, Thu Jun 5 19:29:34 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.
5 > *  oki20.c - program to dump pixel file to OkiMate 20 printer.
6   */
7  
8   #include  <stdio.h>
9 + #include  <time.h>
10  
11 + #include  "platform.h"
12   #include  "color.h"
13   #include  "resolu.h"
14  
15 < #define  NROWS          1440            /* 10" at 144 dpi */
16 < #define  NCOLS          960             /* 8" at 120 dpi */
15 > #define  NROWS          1440            /* 10" at 144 dpi */
16 > #define  NCOLS          960             /* 8" at 120 dpi */
17  
18 < #define  ASPECT         (120./144.)     /* pixel aspect ratio */
18 > #define  ASPECT         (120./144.)     /* pixel aspect ratio */
19  
20 < #define  FILTER         "pfilt -1 -x %d -y %d -p %f %s",NCOLS,NROWS,ASPECT
20 > #define  FILTER         "pfilt -1 -x %d -y %d -p %f %s",NCOLS,NROWS,ASPECT
21  
22   long  lpat[NCOLS];
23  
24   int  dofilter = 0;              /* filter through pfilt first? */
25  
26 + extern FILE  *popen();
27  
28 +
29   main(argc, argv)
30   int  argc;
31   char  *argv[];
32   {
33          int  i, status = 0;
34 <        
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--;
40          }
38 #ifdef _IOLBF
39        stdout->_flag &= ~_IOLBF;
40 #endif
41          if (argc < 2)
42                  status = printp(NULL) == -1;
43          else
# Line 146 | Line 146 | int  y;
146          putchar(i >> 8);
147          for (i = start; i <= end; i++) {
148                  c = lpat[i];
149 <                putchar(c>>16);
150 <                putchar(c>>8 & 255);
151 <                putchar(c & 255);
149 >                putchar((int)(c>>16));
150 >                putchar((int)(c>>8 & 255));
151 >                putchar((int)(c & 255));
152                  if (y)                  /* repeat this row next time */
153                          lpat[i] = (c & 1) << 23;
154                  else                    /* or clear for next image */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines