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

Comparing ray/src/common/objset.c (file contents):
Revision 2.7 by gwlarson, Fri Sep 11 15:26:43 1998 UTC vs.
Revision 2.8 by greg, Sat Feb 22 02:07:22 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   *  objset.c - routines for maintaining object sets.
6   *
7 < *      7/28/85
7 > *  External symbols declared in object.h
8   */
9  
10 + /* ====================================================================
11 + * The Radiance Software License, Version 1.0
12 + *
13 + * Copyright (c) 1990 - 2002 The Regents of the University of California,
14 + * through Lawrence Berkeley National Laboratory.   All rights reserved.
15 + *
16 + * Redistribution and use in source and binary forms, with or without
17 + * modification, are permitted provided that the following conditions
18 + * are met:
19 + *
20 + * 1. Redistributions of source code must retain the above copyright
21 + *         notice, this list of conditions and the following disclaimer.
22 + *
23 + * 2. Redistributions in binary form must reproduce the above copyright
24 + *       notice, this list of conditions and the following disclaimer in
25 + *       the documentation and/or other materials provided with the
26 + *       distribution.
27 + *
28 + * 3. The end-user documentation included with the redistribution,
29 + *           if any, must include the following acknowledgment:
30 + *             "This product includes Radiance software
31 + *                 (http://radsite.lbl.gov/)
32 + *                 developed by the Lawrence Berkeley National Laboratory
33 + *               (http://www.lbl.gov/)."
34 + *       Alternately, this acknowledgment may appear in the software itself,
35 + *       if and wherever such third-party acknowledgments normally appear.
36 + *
37 + * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
38 + *       and "The Regents of the University of California" must
39 + *       not be used to endorse or promote products derived from this
40 + *       software without prior written permission. For written
41 + *       permission, please contact [email protected].
42 + *
43 + * 5. Products derived from this software may not be called "Radiance",
44 + *       nor may "Radiance" appear in their name, without prior written
45 + *       permission of Lawrence Berkeley National Laboratory.
46 + *
47 + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
48 + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
49 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
50 + * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
51 + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
52 + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
53 + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
54 + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
55 + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
56 + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
57 + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 + * SUCH DAMAGE.
59 + * ====================================================================
60 + *
61 + * This software consists of voluntary contributions made by many
62 + * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
63 + * information on Lawrence Berkeley National Laboratory, please see
64 + * <http://www.lbl.gov/>.
65 + */
66 +
67   #include  "standard.h"
68  
69   #include  "octree.h"
# Line 27 | Line 81 | static char SCCSid[] = "$SunId$ LBL";
81   static OBJECT  *ostable[OSTSIZ];        /* the object set table */
82  
83  
84 + void
85   insertelem(os, obj)             /* insert obj into os, no questions */
86   register OBJECT  *os;
87   OBJECT  obj;
# Line 42 | Line 97 | OBJECT  obj;
97   }
98  
99  
100 + void
101   deletelem(os, obj)              /* delete obj from os, no questions */
102   register OBJECT  *os;
103   OBJECT  obj;
# Line 61 | Line 117 | OBJECT  obj;
117   }
118  
119  
120 + int
121   inset(os, obj)                  /* determine if object is in set */
122   register OBJECT  *os;
123   OBJECT  obj;
# Line 92 | Line 149 | OBJECT  obj;
149   }
150  
151  
152 + int
153   setequal(os1, os2)              /* determine if two sets are equal */
154   register OBJECT  *os1, *os2;
155   {
# Line 104 | Line 162 | register OBJECT  *os1, *os2;
162   }
163  
164  
165 + void
166   setcopy(os1, os2)               /* copy object set os2 into os1 */
167   register OBJECT  *os1, *os2;
168   {
# Line 130 | Line 189 | register OBJECT  *os;
189   }
190  
191  
192 + void
193   setunion(osr, os1, os2)         /* osr = os1 Union os2 */
194   register OBJECT  *osr, *os1, *os2;
195   {
# Line 149 | Line 209 | register OBJECT  *osr, *os1, *os2;
209   }
210  
211  
212 + void
213   setintersect(osr, os1, os2)     /* osr = os1 Intersect os2 */
214   register OBJECT  *osr, *os1, *os2;
215   {
# Line 226 | Line 287 | memerr:
287   }
288  
289  
290 + void
291   objset(oset, ot)                /* get object set for full node */
292   register OBJECT  *oset;
293   OCTREE  ot;
# Line 269 | Line 331 | int    (*f)();
331   }
332  
333  
334 + void
335   donesets()                      /* free ALL SETS in our table */
336   {
337          register int  n;
338  
339          for (n = 0; n < OSTSIZ; n++)
340                  if (ostable[n] != NULL) {
341 <                        free((char *)ostable[n]);
341 >                        free((void *)ostable[n]);
342                          ostable[n] = NULL;
343                  }
344   }

Diff Legend

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