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

Comparing ray/src/rt/freeobjmem.c (file contents):
Revision 2.7 by schorsch, Tue Mar 30 16:13:01 2004 UTC vs.
Revision 2.11 by greg, Thu Apr 4 18:51:18 2024 UTC

# Line 12 | Line 12 | static const char      RCSid[] = "$Id$";
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"
# Line 21 | Line 22 | static const char      RCSid[] = "$Id$";
22   #include "mesh.h"
23  
24  
25 < extern int
25 > int
26   free_os(                        /* free unneeded memory for object */
27 <        register OBJREC *op
27 >        OBJREC  *op
28   )
29   {
30          if (op->os == NULL)
# Line 56 | Line 57 | free_os(                       /* free unneeded memory for object */
57                  return(1);
58          case MAT_CLIP:          /* clipping surface */
59          case MAT_SPOT:          /* spot light source */
60 <                free((void *)op->os);
60 >        case PAT_SPECTRUM:      /* constant spectrum */
61 >        case PAT_SPECFILE:      /* spectrum from data file */
62 >                free(op->os);
63                  op->os = NULL;
64                  return(1);
65          }
# Line 67 | Line 70 | free_os(                       /* free unneeded memory for object */
70   }
71  
72  
73 < extern int
73 > int
74   free_objs(              /* free some object structures */
75 <        register OBJECT on,
75 >        OBJECT  on,
76          OBJECT  no
77   )
78   {
79          int     nfreed;
80 <        register OBJREC *op;
80 >        OBJREC  *op;
81  
82          for (nfreed = 0; no-- > 0; on++) {
83                  op = objptr(on);
# Line 85 | Line 88 | free_objs(             /* free some object structures */
88   }
89  
90  
91 < extern void
91 > void
92   free_objmem(void)                       /* free all object cache memory */
93   {
94          free_objs(0, nobjects);
95          freedata(NULL);
96          freefont(NULL);
97 +        SDfreeCache(NULL);
98   }

Diff Legend

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