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

Comparing ray/src/hd/sm_sets.c (file contents):
Revision 3.4 by gwlarson, Wed Nov 11 12:05:41 1998 UTC vs.
Revision 3.7 by greg, Wed Apr 23 00:52:34 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1998 Silicon Graphics, Inc. */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ SGI";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   * Quadtree-specific set operations.
6   */
# Line 37 | Line 34 | OBJECT  *oset;
34      osi = qtfreesets;
35      qtfreesets = (int)qtsettab[osi];
36    } else if ((osi = qtnumsets++) % QTSETIBLK == 0) {
37 <    qtsettab = (OBJECT **)realloc((char *)qtsettab,
37 >    qtsettab = (OBJECT **)realloc((void *)qtsettab,
38                                    (unsigned)(osi+QTSETIBLK)*sizeof(OBJECT *));
39      if (qtsettab == NULL)
40        goto memerr;
# Line 70 | Line 67 | OBJECT  id;
67          lf = QT_SET_INDEX(qt);
68   #endif
69          if (qtsettab[lf][0] <= 1) {             /* blow leaf away */
70 <                free((char *)qtsettab[lf]);
70 >                free((void *)qtsettab[lf]);
71                  qtsettab[lf] = (OBJECT *)qtfreesets;
72                  qtfreesets = lf;
73                  return(EMPTY);
74          }
75          deletelem(qtsettab[lf], id);
76          if (QTONTHRESH(qtsettab[lf][0]))
77 <                qtsettab[lf] = (OBJECT *)realloc((char *)qtsettab[lf],
77 >                qtsettab[lf] = (OBJECT *)realloc((void *)qtsettab[lf],
78                                  QTNODESIZ(qtsettab[lf][0])*sizeof(OBJECT));
79          return(qt);
80   }
# Line 108 | Line 105 | OBJECT  id;
105          lf = QT_SET_INDEX(qt);
106   #endif
107          if (QTONTHRESH(qtsettab[lf][0])) {
108 <                qtsettab[lf] = (OBJECT *)realloc((char *)qtsettab[lf],
108 >                qtsettab[lf] = (OBJECT *)realloc((void *)qtsettab[lf],
109                                  QTNODESIZ(qtsettab[lf][0]+1)*sizeof(OBJECT));
110                  if (qtsettab[lf] == NULL)
111                          error(SYSTEM, "out of memory in qtaddelem");
# Line 142 | Line 139 | QUADTREE  qt;
139          osi = QT_SET_INDEX(qt);
140          if (osi >= qtnumsets)
141                  return;
142 <        free((char *)qtsettab[osi]);
142 >        free((void *)qtsettab[osi]);
143          qtsettab[osi] = (OBJECT *)qtfreesets;
144          qtfreesets = osi;
145   }
# Line 159 | Line 156 | qtfreeleaves()                 /* free ALL sets and leaf nodes */
156          }
157          for (i = qtnumsets; i--; )
158                  if (qtsettab[i] != NULL)
159 <                        free((char *)qtsettab[i]);
160 <        free((char *)qtsettab);
159 >                        free((void *)qtsettab[i]);
160 >        free((void *)qtsettab);
161          qtsettab = NULL;
162          qtnumsets = 0;
163   }

Diff Legend

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