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

Comparing ray/src/common/rglinst.c (file contents):
Revision 3.13 by schorsch, Fri Nov 14 17:22:06 2003 UTC vs.
Revision 3.16 by greg, Fri Feb 18 00:40:25 2011 UTC

# Line 39 | Line 39 | static FILE  *infp;                    /* input file stream */
39   static int  objsize;                    /* size of stored OBJECT's */
40   static short  otypmap[NUMOTYPE+8];      /* object type map */
41  
42 < static unsigned long    imhash(mod) char *mod; {return((unsigned long)mod);}
42 > static unsigned long    imhash(const char *mod) {return((unsigned long)mod);}
43   static LUTAB    imtab = {imhash,NULL,NULL,NULL,0,NULL,0};
44  
45   static LUTAB    ottab = LU_SINIT(free,free);
# Line 89 | Line 89 | register OBJREC        *o;
89  
90  
91   static int
92 < buildoctlist(lp)                        /* build octree list */
93 < LUENT   *lp;
92 > buildoctlist(lp, p)                     /* build octree list */
93 > const LUENT     *lp;
94 > void    *p;
95   {
96          int     old_dolights = dolights, old_domats = domats;
97          register OCTINST        *op = (OCTINST *)lp->data;
# Line 119 | Line 120 | loadoctrees()                          /* load octrees we've saved up */
120                          error(USER, "too many octree levels -- instance loop?");
121                  looptab = ottab;
122                  ottab.tsiz = 0;
123 <                nocts += lu_doall(&looptab, buildoctlist);
123 >                nocts += lu_doall(&looptab, buildoctlist, NULL);
124                  lu_done(&looptab);
125          }
126          return(nocts);
# Line 375 | Line 376 | loadobj()                              /* get next object */
376          (*ofun[ob.otype].funp)(&ob);
377                                          /* record material if modifier */
378          if (ismodifier(ob.otype)) {
379 <                if ((lep = lu_find(&imtab, (char *)nobjects)) == NULL)
379 >                if ((lep = lu_find(&imtab, (char *)(size_t)nobjects)) == NULL)
380                          goto memerr;
381 <                lep->key = (char *)nobjects;
381 >                lep->key = (char *)(size_t)nobjects;
382                  lep->data = (char *)getmatp(ob.oname);
383          }
384          freefargs(&ob.oargs);           /* free arguments */

Diff Legend

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