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

Comparing ray/src/px/ttyimage.c (file contents):
Revision 1.3 by greg, Fri Oct 20 16:44:35 1989 UTC vs.
Revision 2.2 by greg, Mon Sep 21 12:15:22 1992 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1986 Regents of the University of California */
1 > /* Copyright (c) 1992 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 11 | Line 11 | static char SCCSid[] = "$SunId$ LBL";
11   */
12  
13   #include  <stdio.h>
14 + #ifdef MSDOS
15 + #include  <fcntl.h>
16 + #endif
17  
18   #include  "color.h"
19 + #include  "resolu.h"
20  
21  
22 < #define  NCOLS          133
22 > #define  NCOLS          133
23  
24  
25   main(argc, argv)
# Line 25 | Line 29 | char  **argv;
29          FILE  *input;
30          int  xres, yres;
31          COLR  scanline[NCOLS];
28 –        char  sbuf[256];
32          register int  i, j;
33          
34          if (argc < 2)
# Line 34 | Line 37 | char  **argv;
37                  fprintf(stderr, "%s: can't open file \"%s\"\n", argv[0], argv[1]);
38                  exit(1);
39          }
40 <        
41 <                                /* discard header */
42 <        while (fgets(sbuf, sizeof(sbuf), input) != NULL && sbuf[0] != '\n')
40 <                ;
40 > #ifdef MSDOS
41 >        setmode(fileno(input), O_BINARY);
42 > #endif
43                                  /* get picture dimensions */
44 <        if (fgetresolu(&xres, &yres, input) != (YMAJOR|YDECR)) {
45 <                fprintf(stderr, "%s: bad picture size\n", argv[0]);
44 >        if (checkheader(input, COLRFMT, NULL) < 0 ||
45 >                        fgetresolu(&xres, &yres, input) < 0) {
46 >                fprintf(stderr, "%s: bad picture format\n", argv[0]);
47                  exit(1);
48          }
49          if (xres > NCOLS) {
# Line 53 | Line 56 | char  **argv;
56                          fprintf(stderr, "%s: read error\n", argv[0]);
57                          exit(1);
58                  }
59 +                normcolrs(scanline, xres, 0);
60                  for (j = 0; j < xres; j++)
61                          putchar(shade(scanline[j]));
62                  putchar('\n');
# Line 66 | Line 70 | int
70   shade(clr)                      /* return character for color */
71   COLR  clr;
72   {
73 < #define NSHADES  13
73 > #define NSHADES  13
74  
75          static char  shadech[NSHADES+1] = " .,:;+?%&*$@#";
72 –        COLR  nclr;
73 –        register int  b;
76  
77 <        colr_norm(clr, nclr);
76 <        b = norm_bright(nclr);
77 <        b = b*NSHADES/256;
78 <        return(shadech[b]);
77 >        return(shadech[normbright(clr)*NSHADES/256]);
78  
79   #undef NSHADES
80   }

Diff Legend

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