--- ray/src/common/sceneio.c 2003/03/14 21:27:46 2.1 +++ ray/src/common/sceneio.c 2003/06/26 00:58:09 2.4 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: sceneio.c,v 2.1 2003/03/14 21:27:46 greg Exp $"; +static const char RCSid[] = "$Id: sceneio.c,v 2.4 2003/06/26 00:58:09 schorsch Exp $"; #endif /* * Portable, binary Radiance i/o routines. @@ -64,8 +64,8 @@ int objsiz; objp->oargs.iarg = NULL; #endif if ((objp->oargs.nfargs = getint(2, fp)) > 0) { - objp->oargs.farg = (FLOAT *)malloc - (objp->oargs.nfargs*sizeof(FLOAT)); + objp->oargs.farg = (RREAL *)malloc + (objp->oargs.nfargs*sizeof(RREAL)); if (objp->oargs.farg == NULL) goto memerr; for (i = 0; i < objp->oargs.nfargs; i++) @@ -81,6 +81,7 @@ int objsiz; return(obj); memerr: error(SYSTEM, "out of memory in getobj"); + return 0; /* pro forma return */ } @@ -136,7 +137,7 @@ register OBJREC *o; void writescene(firstobj, nobjs, fp) /* write binary scene description */ -OBJECT firstobj, nobjs; +int firstobj, nobjs; FILE *fp; { int i;