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.25 by greg, Fri Jun 30 15:00:32 2023 UTC vs.
Revision 2.26 by greg, Sat Jul 1 01:31:17 2023 UTC

# Line 185 | Line 185 | freadcolrs(                    /* read in an encoded colr scanline */
185          int  i, j;
186          int  code, val;
187                                          /* determine scanline type */
188 <        if ((len < MINELEN) | (len > MAXELEN))
189 <                return(oldreadcolrs(scanline, len, fp));
188 >        if (len <= 0)
189 >                return(0);
190          if ((i = getc(fp)) == EOF)
191                  return(-1);
192 <        if (i != 2) {
193 <                ungetc(i, fp);
194 <                return(oldreadcolrs(scanline, len, fp));
195 <        }
192 >        scanline[0][RED] = i;
193          scanline[0][GRN] = getc(fp);
194          scanline[0][BLU] = getc(fp);
195          if ((i = getc(fp)) == EOF)
196                  return(-1);
197 <        if ((scanline[0][GRN] != 2) | ((scanline[0][BLU] & 0x80) != 0)) {
198 <                scanline[0][RED] = 2;
197 >        if ((scanline[0][RED] != 2) | (scanline[0][GRN] != 2) |
198 >                        (scanline[0][BLU] & 0x80)) {
199                  scanline[0][EXP] = i;
200                  return(oldreadcolrs(scanline+1, len-1, fp));
201          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines