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.6 by greg, Tue Sep 8 10:35:05 1992 UTC vs.
Revision 2.9 by greg, Fri Apr 9 09:49:36 1993 UTC

# Line 12 | Line 12 | static char SCCSid[] = "$SunId$ LBL";
12  
13   #include <stdio.h>
14  
15 + #ifdef MSDOS
16 + #include <fcntl.h>
17 + #endif
18 +
19 + #include <math.h>
20 +
21   #include <errno.h>
22  
23   #include "color.h"
24  
25 < #include  "resolu.h"
25 > #include "resolu.h"
26  
27   #include "calcomp.h"
28  
# Line 64 | Line 70 | int    wrongformat = 0;
70  
71   FILE    *popen();
72  
73 + extern char     *emalloc();
74  
75 +
76   main(argc, argv)
77   int     argc;
78   char    *argv[];
# Line 72 | Line 80 | char   *argv[];
80          int     original;
81          double  f;
82          int     a, i;
83 + #ifdef MSDOS
84 +        extern int  _fmode;
85 +        _fmode = O_BINARY;
86 +        setmode(fileno(stdin), O_BINARY);
87 +        setmode(fileno(stdout), O_BINARY);
88 + #endif
89                                                  /* scan options */
90          for (a = 1; a < argc; a++) {
91                  if (argv[a][0] == '-')
# Line 195 | Line 209 | usage:
209          eputs("Usage: ");
210          eputs(argv[0]);
211          eputs(
212 < " [-w][-x xr][-y yr][-e expr][-f file] [ [-s f][-c r g b] pic ..]\n");
212 > " [-w][-x xr][-y yr][-e expr][-f file] [ [-o][-s f][-c r g b] pic ..]\n");
213          quit(1);
214   }
215  
# Line 335 | Line 349 | combine()                      /* combine pictures */
349  
350   advance()                       /* read in data for next scanline */
351   {
338        extern double  fabs();
352          int     ytarget;
353          register COLOR  *st;
354          register int    i, j;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines