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

Comparing src/hd/rhoptimize.c (file contents):
Revision 3.8 by greg, Sat Feb 22 02:07:25 2003 UTC vs.
Revision 3.11 by greg, Fri Jun 13 15:27:04 2003 UTC

# Line 67 | Line 67 | char   *argv[];
67                  lseek(hdfd[0], (off_t)nextipos, 0);
68                  read(hdfd[0], (char *)&nextipos, sizeof(nextipos));
69                                          /* get output position; set last */
70 <                thisopos = lseek(hdfd[1], (off_t)0L, 2);
70 >                thisopos = lseek(hdfd[1], (off_t)0, 2);
71                  if (lastopos > 0L) {
72                          lseek(hdfd[1], (off_t)lastopos, 0);
73                          write(hdfd[1], (char *)&thisopos, sizeof(thisopos));
74 <                        lseek(hdfd[1], (off_t)0L, 2);
74 >                        lseek(hdfd[1], (off_t)0, 2);
75                  }
76                  lastopos = thisopos;
77                  thisopos = 0L;          /* write place holder */
# Line 172 | Line 172 | static int
172   bpcmp(b1p, b2p)                 /* compare beam positions on disk */
173   int     *b1p, *b2p;
174   {
175 <        register long   pdif = beamdir[*b1p].fo - beamdir[*b2p].fo;
175 >        register off_t  pdif = beamdir[*b1p].fo - beamdir[*b2p].fo;
176  
177          if (pdif < 0L) return(-1);
178          return(pdif > 0L);
# Line 190 | Line 190 | int    *bq, nb;
190          int     n;
191  
192          beamdir = hp->bi;               /* sort based on file position */
193 <        qsort((char *)bq, nb, sizeof(*bq), bpcmp);
193 >        qsort((void *)bq, nb, sizeof(*bq), bpcmp);
194                                          /* transfer and free each beam */
195          for (i = 0; i < nb; i++) {
196                  bp = hdgetbeam(hp, bq[i]);
197                  DCHECK(bp==NULL, CONSISTENCY, "empty beam in xferclump");
198                  n = dupchecking ? nuniq(hdbray(bp),bp->nrm) : bp->nrm;
199 <                bcopy((char *)hdbray(bp), (char *)hdnewrays(hout,bq[i],n),
199 >                bcopy((void *)hdbray(bp), (void *)hdnewrays(hout,bq[i],n),
200                                  n*sizeof(RAYVAL));
201                  hdfreebeam(hp, bq[i]);
202          }

Diff Legend

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