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

Comparing ray/src/common/color.c (file contents):
Revision 2.17 by greg, Sat May 31 20:13:31 2014 UTC vs.
Revision 2.18 by greg, Tue Apr 10 23:38:40 2018 UTC

# Line 19 | Line 19 | static const char      RCSid[] = "$Id$";
19   #undef putc
20   #define getc    getc_unlocked
21   #define putc    putc_unlocked
22 + #define ferror  ferror_unlocked
23   #endif
24  
25   #define  MINELEN        8       /* minimum scanline length for encoding */
# Line 106 | Line 107 | oldreadcolrs(                  /* read in an old colr scanline */
107          FILE  *fp
108   )
109   {
110 <        int  rshift;
110 >        int  rshift = 0;
111          int  i;
112          
112 –        rshift = 0;
113 –        
113          while (len > 0) {
114                  scanline[0][RED] = getc(fp);
115                  scanline[0][GRN] = getc(fp);
116                  scanline[0][BLU] = getc(fp);
117 <                scanline[0][EXP] = getc(fp);
118 <                if (feof(fp) || ferror(fp))
117 >                scanline[0][EXP] = i = getc(fp);
118 >                if (i == EOF)
119                          return(-1);
120                  if (scanline[0][RED] == 1 &&
121                                  scanline[0][GRN] == 1 &&

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines