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.31 by greg, Mon Nov 27 21:00:14 2023 UTC vs.
Revision 2.32 by greg, Thu Dec 7 23:16:58 2023 UTC

# Line 492 | Line 492 | freadcolrs(                    /* read in an encoded colr scanline */
492   int
493   freadscolrs(uby8 *scanline, int nc, int len, FILE *fp)
494   {
495 +        if (nc < 3)
496 +                return(-1);
497 +        if (nc == 3)
498 +                return(freadcolrs((COLR *)scanline, len, fp));
499 +
500          if (fread(scanline, nc+1, len, fp) != len)
501                  return(-1);
502          return(0);
# Line 502 | Line 507 | freadscolrs(uby8 *scanline, int nc, int len, FILE *fp)
507   int
508   fwritescolrs(uby8 *sscanline, int nc, int len, FILE *fp)
509   {
510 +        if (nc < 3)
511 +                return(-1);
512 +        if (nc == 3)
513 +                return(fwritecolrs((COLR *)sscanline, len, fp));
514 +
515          if (fwrite(sscanline, nc+1, len, fp) != len)
516                  return(-1);
517          return(0);
# Line 509 | Line 519 | fwritescolrs(uby8 *sscanline, int nc, int len, FILE *f
519  
520  
521   int
522 < fwritescan(                     /* write out a scanline */
522 > fwritescan(             /* write out an RGB or XYZ scanline */
523          COLOR  *scanline,
524          int  len,
525          FILE  *fp
# Line 536 | Line 546 | fwritescan(                    /* write out a scanline */
546  
547  
548   int
549 < freadscan(                      /* read in a scanline */
549 > freadscan(              /* read in an RGB or XYZ scanline */
550          COLOR  *scanline,
551          int  len,
552          FILE  *fp
# Line 582 | Line 592 | freadsscan(COLORV *sscanline, int nc, int len, FILE *f
592   }
593  
594  
595 < /* write an spectral color scanline (NCSAMP) */
595 > /* write an nc-component spectral color scanline */
596   int
597   fwritesscan(COLORV *sscanline, int nc, int len, FILE *fp)
598   {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines