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

Comparing ray/src/hd/rholo3.c (file contents):
Revision 3.5 by gregl, Thu Nov 6 16:11:49 1997 UTC vs.
Revision 3.6 by gregl, Mon Nov 10 18:06:18 1997 UTC

# Line 126 | Line 126 | int    nents;
126                                          /* display what we have */
127          for (i = 0; i < nents; i++)
128                  if ((b = hdgetbeam(hdlist[clist[i].hd], clist[i].bi)) != NULL) {
129 <                        bcopy((char *)hdbray(b), (char *)packrays(p),
129 >                        bcopy((char *)hdbray(b), (char *)packra(p),
130                                          (p->nr=b->nrm)*sizeof(RAYVAL));
131                          disp_packet(p);
132                  }
# Line 272 | Line 272 | sortcomplist()                 /* fix our list order */
272          done_packets(flush_queue());
273          if (complen <= 0)       /* check to see if there is even a list */
274                  return;
275 <        if (lastin < 0)         /* flag to sort entire list */
275 >        if (lastin < 0 || listpos*4 >= complen*3)
276                  qsort((char *)complist, complen, sizeof(PACKHEAD), beamcmp);
277          else if (listpos) {     /* else sort and merge sublist */
278                  list2 = (PACKHEAD *)malloc(listpos*sizeof(PACKHEAD));

Diff Legend

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