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

Comparing ray/src/hd/clumpbeams.c (file contents):
Revision 3.5 by schorsch, Mon Jul 21 22:30:18 2003 UTC vs.
Revision 3.6 by schorsch, Sun Jul 27 22:12:02 2003 UTC

# Line 76 | Line 76 | int    b;
76          bneighrem = 0;
77          for (i = 9; i--; )
78                  for (j = 9; j--; ) {
79 <                        if (i == 4 & j == 4)    /* don't copy starting beam */
79 >                        if ((i == 4) & (j == 4))        /* don't copy starting beam */
80                                  continue;
81                          if (wg0[i].w == wg1[j].w)
82                                  continue;
# Line 112 | Line 112 | int    (*cf)();
112          bqueue = (int *)malloc(maxcnt*sizeof(int));
113          bflags = (uint32 *)calloc((nbeams(hp)>>5)+1,
114                          sizeof(uint32));
115 <        if (bqueue == NULL | bflags == NULL)
115 >        if ((bqueue == NULL) | (bflags == NULL))
116                  error(SYSTEM, "out of memory in clumpbeams");
117                                          /* mark empty beams as done */
118          for (i = nbeams(hp); i > 0; i--)

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)