ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/rt/lookamb.c
(Generate patch)

Comparing ray/src/rt/lookamb.c (file contents):
Revision 2.8 by greg, Tue Feb 25 02:47:22 2003 UTC vs.
Revision 2.10 by schorsch, Tue Mar 30 16:13:01 2004 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7  
8   #include "copyright.h"
9  
10 + #include  "platform.h"
11   #include  "ray.h"
11 –
12   #include  "ambient.h"
13 + #include  "resolu.h"
14  
15  
16   int  dataonly = 0;
# Line 19 | Line 20 | int  reverse = 0;
20   AMBVAL  av;
21  
22  
23 < main(argc, argv)                /* load ambient values from a file */
24 < int  argc;
25 < char  *argv[];
23 > int
24 > main(           /* load ambient values from a file */
25 >        int  argc,
26 >        char  *argv[]
27 > )
28   {
29          FILE  *fp;
30          int  i;
# Line 62 | Line 65 | char  *argv[];
65                  }
66                  fputformat(AMBFMT, stdout);
67                  putchar('\n');
68 < #ifdef MSDOS
66 <                setmode(fileno(stdout), O_BINARY);
67 < #endif
68 >                SET_FILE_BINARY(stdout);
69                  putambmagic(stdout);
70                  writamb(fp);
71          } else {
72 < #ifdef MSDOS
72 <                setmode(fileno(fp), O_BINARY);
73 < #endif
72 >                SET_FILE_BINARY(fp);
73                  if (checkheader(fp, AMBFMT, header ? stdout : (FILE *)NULL) < 0)
74                          goto formaterr;
75                  if (!hasambmagic(fp))
# Line 89 | Line 88 | formaterr:
88   }
89  
90  
91 < void
92 < lookamb(fp)                     /* get ambient values from a file */
93 < FILE  *fp;
91 > extern void
92 > lookamb(                        /* get ambient values from a file */
93 >        FILE  *fp
94 > )
95   {
96          while (readambval(&av, fp)) {
97                  if (dataonly) {
# Line 125 | Line 125 | FILE  *fp;
125   }
126  
127  
128 < void
129 < writamb(fp)                     /* write binary ambient values */
130 < FILE  *fp;
128 > extern void
129 > writamb(                        /* write binary ambient values */
130 >        FILE  *fp
131 > )
132   {
133          for ( ; ; ) {
134                  if (!dataonly)

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)