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

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

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   *  lookamb.c - program to examine ambient components.
6   */
7  
8 < /* ====================================================================
9 < * The Radiance Software License, Version 1.0
10 < *
11 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
12 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
13 < *
14 < * Redistribution and use in source and binary forms, with or without
15 < * modification, are permitted provided that the following conditions
16 < * are met:
17 < *
18 < * 1. Redistributions of source code must retain the above copyright
19 < *         notice, this list of conditions and the following disclaimer.
20 < *
21 < * 2. Redistributions in binary form must reproduce the above copyright
22 < *       notice, this list of conditions and the following disclaimer in
23 < *       the documentation and/or other materials provided with the
24 < *       distribution.
25 < *
26 < * 3. The end-user documentation included with the redistribution,
27 < *           if any, must include the following acknowledgment:
28 < *             "This product includes Radiance software
29 < *                 (http://radsite.lbl.gov/)
30 < *                 developed by the Lawrence Berkeley National Laboratory
31 < *               (http://www.lbl.gov/)."
32 < *       Alternately, this acknowledgment may appear in the software itself,
33 < *       if and wherever such third-party acknowledgments normally appear.
34 < *
35 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36 < *       and "The Regents of the University of California" must
37 < *       not be used to endorse or promote products derived from this
38 < *       software without prior written permission. For written
39 < *       permission, please contact [email protected].
40 < *
41 < * 5. Products derived from this software may not be called "Radiance",
42 < *       nor may "Radiance" appear in their name, without prior written
43 < *       permission of Lawrence Berkeley National Laboratory.
44 < *
45 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56 < * SUCH DAMAGE.
57 < * ====================================================================
58 < *
59 < * This software consists of voluntary contributions made by many
60 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61 < * information on Lawrence Berkeley National Laboratory, please see
62 < * <http://www.lbl.gov/>.
63 < */
8 > #include "copyright.h"
9  
10 + #include  "platform.h"
11   #include  "ray.h"
66
12   #include  "ambient.h"
13 + #include  "resolu.h"
14  
15  
16   int  dataonly = 0;
# Line 74 | 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 117 | Line 65 | char  *argv[];
65                  }
66                  fputformat(AMBFMT, stdout);
67                  putchar('\n');
68 < #ifdef MSDOS
121 <                setmode(fileno(stdout), O_BINARY);
122 < #endif
68 >                SET_FILE_BINARY(stdout);
69                  putambmagic(stdout);
70                  writamb(fp);
71          } else {
72 < #ifdef MSDOS
127 <                setmode(fileno(fp), O_BINARY);
128 < #endif
72 >                SET_FILE_BINARY(fp);
73                  if (checkheader(fp, AMBFMT, header ? stdout : (FILE *)NULL) < 0)
74                          goto formaterr;
75                  if (!hasambmagic(fp))
# Line 144 | 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 180 | 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
> Changed lines