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

Comparing ray/src/rt/ambio.c (file contents):
Revision 2.10 by greg, Wed Mar 2 22:03:49 2016 UTC vs.
Revision 2.12 by greg, Fri Jan 27 22:00:49 2017 UTC

# Line 13 | Line 13 | static const char      RCSid[] = "$Id$";
13   #include "ambient.h"
14  
15  
16 < #define  badflt(x)      ((x) < -FHUGE || (x) > FHUGE)
16 > #define  badflt(x)      (((x) < -FHUGE) | ((x) > FHUGE))
17  
18   #define  badvec(v)      (badflt((v)[0]) | badflt((v)[1]) | badflt((v)[2]))
19  
# Line 64 | Line 64 | writambval(                    /* write ambient value to stream */
64          putint(av->udir, sizeof(av->udir), fp);
65          setcolr(clr, colval(av->val,RED),
66                          colval(av->val,GRN), colval(av->val,BLU));
67 <        fwrite((char *)clr, sizeof(clr), 1, fp);
67 >        putbinary((char *)clr, sizeof(clr), 1, fp);
68          putv2(av->rad, fp);
69          putv2(av->gpos, fp);
70          putv2(av->gdir, fp);
# Line 112 | Line 112 | readambval(                    /* read ambient value from stream */
112          getpos(av->pos, fp);
113          av->ndir = getint(sizeof(av->ndir), fp);
114          av->udir = getint(sizeof(av->udir), fp);
115 <        if (fread((char *)clr, sizeof(clr), 1, fp) != 1)
115 >        if (getbinary((char *)clr, sizeof(clr), 1, fp) != 1)
116                  return(0);
117          colr_color(av->val, clr);
118          getv2(av->rad, fp);
# Line 144 | Line 144 | FILE  *fp;
144          putvec(av->dir, fp);
145          setcolr(clr, colval(av->val,RED),
146                          colval(av->val,GRN), colval(av->val,BLU));
147 <        fwrite((char *)clr, sizeof(clr), 1, fp);
147 >        putbinary((char *)clr, sizeof(clr), 1, fp);
148          putflt(av->rad, fp);
149          putvec(av->gpos, fp);
150          putvec(av->gdir, fp);
# Line 190 | Line 190 | FILE  *fp;
190          av->weight = getflt(fp);
191          getvec(av->pos, fp);
192          getvec(av->dir, fp);
193 <        if (fread((char *)clr, sizeof(clr), 1, fp) != 1)
193 >        if (getbinary((char *)clr, sizeof(clr), 1, fp) != 1)
194                  return(0);
195          colr_color(av->val, clr);
196          av->rad = getflt(fp);

Diff Legend

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