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

Comparing ray/src/rt/freeobjmem.c (file contents):
Revision 2.4 by greg, Sat Feb 22 02:07:28 2003 UTC vs.
Revision 2.8 by greg, Fri Feb 18 00:40:25 2011 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7   * External symbols declared in ray.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 < */
10 > #include "copyright.h"
11  
12   #include "ray.h"
13   #include "otypes.h"
14 + #include "rtotypes.h"
15 + #include "bsdf.h"
16   #include "face.h"
17   #include "cone.h"
18   #include "instance.h"
19   #include "data.h"
20   #include "font.h"
21 + #include "func.h"
22 + #include "mesh.h"
23  
24  
25 < int
26 < free_os(op)                     /* free unneeded memory for object */
27 < register OBJREC *op;
25 > extern int
26 > free_os(                        /* free unneeded memory for object */
27 >        register OBJREC *op
28 > )
29   {
30          if (op->os == NULL)
31                  return(0);
# Line 97 | Line 47 | register OBJREC        *op;
47          case OBJ_INSTANCE:      /* octree instance */
48                  freeinstance(op);
49                  return(1);
50 +        case OBJ_MESH:          /* mesh instance */
51 +                freemeshinst(op);
52 +                return(1);
53          case PAT_BTEXT:         /* monochromatic text */
54          case PAT_CTEXT:         /* colored text */
55          case MIX_TEXT:          /* mixing text */
# Line 115 | Line 68 | register OBJREC        *op;
68   }
69  
70  
71 < int
72 < free_objs(on, no)               /* free some object structures */
73 < register OBJECT on;
74 < OBJECT  no;
71 > extern int
72 > free_objs(              /* free some object structures */
73 >        register OBJECT on,
74 >        OBJECT  no
75 > )
76   {
77          int     nfreed;
78          register OBJREC *op;
# Line 132 | Line 86 | OBJECT no;
86   }
87  
88  
89 < void
90 < free_objmem()                   /* free all object cache memory */
89 > extern void
90 > free_objmem(void)                       /* free all object cache memory */
91   {
92          free_objs(0, nobjects);
93          freedata(NULL);
94          freefont(NULL);
95 +        SDfreeCache(NULL);
96   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines