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

Comparing ray/src/common/readobj.c (file contents):
Revision 2.4 by greg, Sat Jan 1 09:18:47 1994 UTC vs.
Revision 2.7 by gwlarson, Thu Nov 5 16:51:26 1998 UTC

# Line 31 | Line 31 | char  *inpspec;
31          char  *fgetline();
32          OBJECT  lastobj;
33          FILE  *infp;
34 <        char  buf[512];
34 >        char  buf[1024];
35          register int  c;
36  
37          lastobj = nobjects;
# Line 138 | Line 138 | newobject()                            /* get a new object */
138   {
139          register int  i;
140  
141 <        if ((nobjects & 077) == 0) {            /* new block */
141 >        if ((nobjects & (OBJBLKSIZ-1)) == 0) {  /* new block */
142                  errno = 0;
143 <                i = nobjects >> 6;
143 >                i = nobjects >> OBJBLKSHFT;
144                  if (i >= MAXOBJBLK)
145                          return(OVOID);
146 <                objblock[i] = (OBJREC *)bmalloc(0100*sizeof(OBJREC));
146 >                objblock[i] = (OBJREC *)bmalloc(OBJBLKSIZ*sizeof(OBJREC));
147                  if (objblock[i] == NULL)
148                          return(OVOID);
149          }

Diff Legend

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