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

Comparing ray/src/hd/rhcopy.c (file contents):
Revision 3.15 by greg, Sat Feb 22 02:07:24 2003 UTC vs.
Revision 3.18 by schorsch, Mon Jul 21 22:30:18 2003 UTC

# Line 107 | Line 107 | openholo(fname, append)                /* open existing holodeck fil
107   char    *fname;
108   int     append;
109   {
110        extern long     ftell();
110          FILE    *fp;
111          int     fd;
112          int     hflags = 0;
# Line 195 | Line 194 | static int
194   bpcmp(b1p, b2p)                 /* compare beam positions on disk */
195   int     *b1p, *b2p;
196   {
197 <        register long   pdif = beamdir[*b1p].fo - beamdir[*b2p].fo;
197 >        register off_t  pdif = beamdir[*b1p].fo - beamdir[*b2p].fo;
198  
199          if (pdif > 0L) return(1);
200          if (pdif < 0L) return(-1);
# Line 299 | Line 298 | char   *pcf, *zbf;
298          int     eshft;
299          double  emult;
300          RESOLU  prs;
301 <        FLOAT   vl[2];
301 >        RREAL   vl[2];
302          FVECT   ro, rd;
303          double  aftd;
304          COLOR   ctmp;
# Line 315 | Line 314 | char   *pcf, *zbf;
314                  error(SYSTEM, pcf);
315          }
316                                  /* load picture header */
317 <        copystruct(&phd.vw, &stdview);
317 >        phd.vw = stdview;
318          phd.expos = 1.0;
319          phd.badfmt = phd.gotview = phd.altprims = 0;
320          if (getheader(pfp, picheadline, (char *)&phd) < 0 ||

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines