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

Comparing ray/src/px/psum.c (file contents):
Revision 2.1 by greg, Tue Nov 12 16:05:27 1991 UTC vs.
Revision 2.5 by greg, Sat Feb 22 02:07:27 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   *  psum.c - program to sum pictures.
6   *
# Line 12 | Line 9 | static char SCCSid[] = "$SunId$ LBL";
9  
10   #include  <stdio.h>
11  
12 + #include  <math.h>
13 +
14   #include  "color.h"
15  
16  
# Line 27 | Line 26 | COLOR  scale[MAXFILE];                 /* scaling factors */
26   int  nfile;                             /* number of files */
27  
28  
29 + int
30   tabputs(s)                      /* print line preceded by a tab */
31   char  *s;
32   {
33          putc('\t', stdout);
34 <        fputs(s, stdout);
34 >        return(fputs(s, stdout));
35   }
36  
37  
# Line 39 | Line 39 | main(argc, argv)
39   int  argc;
40   char  *argv[];
41   {
42 <        double  d, atof();
42 >        double  d;
43          int  xres, yres;
44          int  an;
45  
# Line 152 | Line 152 | psum()                         /* sum the files */
152                          quit(1);
153                  }
154          }
155 <        free((char *)scanin);
156 <        free((char *)scanout);
155 >        free((void *)scanin);
156 >        free((void *)scanout);
157   }
158  
159  
160 + void
161   quit(code)              /* exit gracefully */
162   int  code;
163   {

Diff Legend

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