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

Comparing ray/src/hd/rhdisp2.c (file contents):
Revision 3.32 by gwlarson, Thu Mar 4 10:29:22 1999 UTC vs.
Revision 3.36 by schorsch, Sun Jul 27 22:12:02 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   * Holodeck beam tracking for display process
6   */
# Line 37 | Line 34 | newcbeam()             /* allocate new entry at end of cbeam arra
34                          cbeam = (PACKHEAD *)malloc(
35                                          maxcbeam*sizeof(PACKHEAD) );
36                  else
37 <                        cbeam = (PACKHEAD *)realloc( (char *)cbeam,
37 >                        cbeam = (PACKHEAD *)realloc((void *)cbeam,
38                                          maxcbeam*sizeof(PACKHEAD) );
39                  if (cbeam == NULL)
40                          error(SYSTEM, "out of memory in newcbeam");
# Line 106 | Line 103 | int    bi;
103                  if (cbeam[n].bi == bi && cbeam[n].hd == hd)
104                          return(n);
105                                  /* check legality */
106 <        if (hd < 0 | hd >= HDMAX || hdlist[hd] == NULL)
106 >        if ((hd < 0) | (hd >= HDMAX) || hdlist[hd] == NULL)
107                  error(INTERNAL, "illegal holodeck number in getcbeam");
108 <        if (bi < 1 | bi > nbeams(hdlist[hd]))
108 >        if ((bi < 1) | (bi > nbeams(hdlist[hd])))
109                  error(INTERNAL, "illegal beam index in getcbeam");
110          n = newcbeam();         /* allocate and assign */
111          cbeam[n].hd = hd; cbeam[n].bi = bi; cbeam[n].nr = cbeam[n].nc = 0;
# Line 150 | Line 147 | int    fresh;
147   }
148  
149  
150 < int2 *
150 > int16 *
151   beam_view(vn, hr, vr)           /* add beam view (if advisable) */
152   VIEW    *vn;
153   int     hr, vr;
154   {
155 <        int2    *slist;
155 >        int16   *slist;
156          BEAMLIST        blist;
157          double  eravg, d;
158          register HOLO   *hp;
# Line 174 | Line 171 | int    hr, vr;
171                  if (blist.bl[i].nr > cbeam[n].nr)
172                          cbeam[n].nr = blist.bl[i].nr;
173          }
174 <        free((char *)blist.bl);         /* free list */
174 >        free((void *)blist.bl);         /* free list */
175          if (MEYERNG <= FTINY)
176                  return(slist);
177                                          /* compute average eye range */

Diff Legend

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