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.4 by schorsch, Thu Jun 5 19:29:34 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1986 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   *  ttyimage.c - program to dump pixel file to dumb terminal.
6   *
# Line 11 | Line 8 | static char SCCSid[] = "$SunId$ LBL";
8   */
9  
10   #include  <stdio.h>
11 + #include  <time.h>
12  
13 + #include  "platform.h"
14   #include  "color.h"
15 + #include  "resolu.h"
16  
17  
18 < #define  NCOLS          133
18 > #define  NCOLS          133
19  
20  
21   main(argc, argv)
# Line 25 | Line 25 | char  **argv;
25          FILE  *input;
26          int  xres, yres;
27          COLR  scanline[NCOLS];
28 –        char  sbuf[256];
28          register int  i, j;
29          
30          if (argc < 2)
# Line 34 | Line 33 | char  **argv;
33                  fprintf(stderr, "%s: can't open file \"%s\"\n", argv[0], argv[1]);
34                  exit(1);
35          }
36 <        
38 <                                /* discard header */
39 <        while (fgets(sbuf, sizeof(sbuf), input) != NULL && sbuf[0] != '\n')
40 <                ;
36 >        SET_FILE_BINARY(input);
37                                  /* get picture dimensions */
38 <        if (fgetresolu(&xres, &yres, input) != (YMAJOR|YDECR)) {
39 <                fprintf(stderr, "%s: bad picture size\n", argv[0]);
38 >        if (checkheader(input, COLRFMT, NULL) < 0 ||
39 >                        fgetresolu(&xres, &yres, input) < 0) {
40 >                fprintf(stderr, "%s: bad picture format\n", argv[0]);
41                  exit(1);
42          }
43          if (xres > NCOLS) {
# Line 53 | Line 50 | char  **argv;
50                          fprintf(stderr, "%s: read error\n", argv[0]);
51                          exit(1);
52                  }
53 +                normcolrs(scanline, xres, 0);
54                  for (j = 0; j < xres; j++)
55                          putchar(shade(scanline[j]));
56                  putchar('\n');
# Line 66 | Line 64 | int
64   shade(clr)                      /* return character for color */
65   COLR  clr;
66   {
67 < #define NSHADES  13
67 > #define NSHADES  13
68  
69          static char  shadech[NSHADES+1] = " .,:;+?%&*$@#";
72 –        COLR  nclr;
73 –        register int  b;
70  
71 <        colr_norm(clr, nclr);
76 <        b = norm_bright(nclr);
77 <        b = b*NSHADES/256;
78 <        return(shadech[b]);
71 >        return(shadech[normbright(clr)*NSHADES/256]);
72  
73   #undef NSHADES
74   }

Diff Legend

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