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

Comparing ray/src/common/rglinst.c (file contents):
Revision 3.5 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 3.9 by schorsch, Thu Jun 5 19:29:34 2003 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   * Routines for reading instances and converting to OpenGL.
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 "radogl.h"
11   #include "octree.h"
12 + #include "platform.h"
13  
14   #define MAXLEVEL        16              /* maximum instance hierarchy level */
15  
# Line 132 | Line 78 | register OBJREC        *o;
78                  glPopAttrib();
79          }
80          rgl_checkerr("creating instance");
81 +        return(0);
82   }
83  
84  
# Line 177 | Line 124 | static OCTINST *
124   getoct(name)                            /* get/assign octree list id */
125   char    *name;
126   {
180 –        extern char     *getpath(), *getlibpath();
127          char    *path;
128          register LUENT  *lp;
129          register OCTINST        *op;
# Line 191 | Line 137 | char   *name;
137                  strcpy(lp->key, name);
138          }
139          if ((op = (OCTINST *)lp->data) == NULL) {
140 <                path = getpath(name, getlibpath(), R_OK);
140 >                path = getpath(name, getrlibpath(), R_OK);
141                  if (path == NULL) {
142                          sprintf(errmsg, "cannot find octree \"%s\"", name);
143                          error(USER, errmsg);
# Line 223 | Line 169 | FVECT  cent;
169                  sprintf(errmsg, "cannot open octree file \"%s\"", fname);
170                  error(SYSTEM, errmsg);
171          }
172 < #ifdef MSDOS
227 <        setmode(fileno(infp), O_BINARY);
228 < #endif
172 >        SET_FILE_BINARY(infp);
173                                          /* get header */
174          if (checkheader(infp, OCTFMT, NULL) < 0)
175                  octerror(USER, "not an octree");
# Line 262 | Line 206 | char  *fname;
206          
207          infn = fname;
208          infp = fopen(fname, "r");       /* assume already checked */
209 < #ifdef MSDOS
266 <        setmode(fileno(infp), O_BINARY);
267 < #endif
209 >        SET_FILE_BINARY(infp);
210                                          /* skip header */
211          getheader(infp, NULL, NULL);
212                                          /* get format */

Diff Legend

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