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

Comparing ray/src/common/cone.c (file contents):
Revision 2.2 by greg, Sun Sep 6 11:53:47 1992 UTC vs.
Revision 2.7 by schorsch, Sat Jun 7 12:50:20 2003 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1992 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   *  cone.c - routines for making cones
9 *
10 *     2/12/86
6   */
7  
8 + #include "copyright.h"
9 +
10   #include  "standard.h"
11  
12   #include  "object.h"
# Line 48 | Line 45 | getcone(o, getxf)                      /* get cone structure */
45   register OBJREC  *o;
46   int  getxf;
47   {
51        extern double  sqrt();
48          int  sgn0, sgn1;
49          register CONE  *co;
50  
# Line 147 | Line 143 | argcerr:
143          objerror(o, USER, "bad # arguments");
144   raderr:
145          objerror(o, USER, "illegal radii");
146 +        return NULL; /* pro forma return */
147   }
148  
149  
150 + void
151   freecone(o)                     /* free memory associated with cone */
152   OBJREC  *o;
153   {
154          register CONE  *co = (CONE *)o->os;
155  
156 <        if (o->os == NULL)
156 >        if (co == NULL)
157                  return;
158          if (co->tm != NULL)
159 <                free((char *)co->tm);
160 <        free(o->os);
159 >                free((void *)co->tm);
160 >        free((void *)co);
161          o->os = NULL;
162   }
163  
164  
165 + void
166   conexform(co)                   /* get cone transformation matrix */
167   register CONE  *co;
168   {
170        extern double  sqrt();
169          MAT4  m4;
170          register double  d;
171          register int  i;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines