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

Comparing ray/src/common/sceneio.c (file contents):
Revision 2.1 by greg, Fri Mar 14 21:27:46 2003 UTC vs.
Revision 2.4 by schorsch, Thu Jun 26 00:58:09 2003 UTC

# Line 64 | Line 64 | int    objsiz;
64                  objp->oargs.iarg = NULL;
65   #endif
66          if ((objp->oargs.nfargs = getint(2, fp)) > 0) {
67 <                objp->oargs.farg = (FLOAT *)malloc
68 <                                (objp->oargs.nfargs*sizeof(FLOAT));
67 >                objp->oargs.farg = (RREAL *)malloc
68 >                                (objp->oargs.nfargs*sizeof(RREAL));
69                  if (objp->oargs.farg == NULL)
70                          goto memerr;
71                  for (i = 0; i < objp->oargs.nfargs; i++)
# Line 81 | Line 81 | int    objsiz;
81          return(obj);
82   memerr:
83          error(SYSTEM, "out of memory in getobj");
84 +        return 0; /* pro forma return */
85   }
86  
87  
# Line 136 | Line 137 | register OBJREC  *o;
137  
138   void
139   writescene(firstobj, nobjs, fp)         /* write binary scene description */
140 < OBJECT  firstobj, nobjs;
140 > int     firstobj, nobjs;
141   FILE    *fp;
142   {
143          int     i;

Diff Legend

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