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

Comparing ray/src/px/pcomb.c (file contents):
Revision 2.29 by schorsch, Mon Oct 27 10:24:51 2003 UTC vs.
Revision 2.31 by greg, Mon Mar 15 21:16:54 2004 UTC

# Line 33 | Line 33 | int    nfiles;                         /* number of input files */
33  
34   char    ourfmt[LPICFMT+1] = PICFMT;     /* input picture format */
35  
36 + char    StandardInput[] = "<stdin>";
37   char    Command[] = "<Command>";
38   char    vcolin[3][4] = {"ri", "gi", "bi"};
39   char    vcolout[3][4] = {"ro", "go", "bo"};
# Line 73 | Line 74 | int    gotview;
74  
75   extern char     *emalloc();
76  
77 + static gethfunc tabputs;
78  
79   main(argc, argv)
80   int     argc;
# Line 123 | Line 125 | char   *argv[];
125                  if (argv[a][0] == '-')
126                          switch (argv[a][1]) {
127                          case '\0':
128 <                                input[nfiles].name = "<stdin>";
128 >                                input[nfiles].name = StandardInput;
129                                  input[nfiles].fp = stdin;
130                                  break;
131                          case 'o':
# Line 219 | Line 221 | usage:
221   }
222  
223  
224 < tabputs(s)                      /* put out string preceded by a tab */
225 < char    *s;
224 > static int
225 > tabputs(                        /* put out string preceded by a tab */
226 >        char    *s,
227 >        void    *p
228 > )
229   {
230          char    fmt[32];
231          double  d;

Diff Legend

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