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.4 by greg, Thu Nov 19 21:32:48 1992 UTC vs.
Revision 2.8 by schorsch, Thu Jun 26 00:58:09 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 146 | 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   {
# Line 157 | Line 156 | OBJREC  *o;
156          if (co == NULL)
157                  return;
158          if (co->tm != NULL)
159 <                free((char *)co->tm);
160 <        free((char *)co);
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   {
# Line 170 | Line 170 | register CONE  *co;
170          register double  d;
171          register int  i;
172  
173 <        co->tm = (FLOAT (*)[4])malloc(sizeof(MAT4));
173 >        co->tm = (RREAL (*)[4])malloc(sizeof(MAT4));
174          if (co->tm == NULL)
175                  error(SYSTEM, "out of memory in conexform");
176  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines