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

Comparing ray/src/rt/rpict.c (file contents):
Revision 2.102 by greg, Wed Jul 31 22:21:28 2024 UTC vs.
Revision 2.103 by greg, Mon Aug 12 18:57:00 2024 UTC

# Line 668 | Line 668 | pixvalue(              /* compute pixel value */
668          int  y
669   )
670   {
671        static COLORMAT xyz2myrgbmat;
671          RAY  thisray;
672          FVECT   lorg, ldir;
673          double  hpos, vpos, lmax;
# Line 702 | Line 701 | pixvalue(              /* compute pixel value */
701          rayorigin(&thisray, PRIMARY, NULL, NULL);
702  
703          rayvalue(&thisray);                     /* trace ray */
704 <
705 <        if (out_prims == stdprims) {            /* return color */
707 <                scolor_rgb(col, thisray.rcol);
708 <        } else if (out_prims == xyzprims) {
709 <                scolor_cie(col, thisray.rcol);
710 <                scalecolor(col, WHTEFFICACY);
711 <        } else if (NCSAMP > 3) {
712 <                COLOR   xyz;
713 <                if (xyz2myrgbmat[0][0] == 0)
714 <                        compxyz2rgbWBmat(xyz2myrgbmat, out_prims);
715 <                scolor_cie(xyz, thisray.rcol);
716 <                colortrans(col, xyz2myrgbmat, xyz);
717 <                clipgamut(col, xyz[CIEY], CGAMUT_LOWER, cblack, cwhite);
718 <        } else
719 <                copycolor(col, thisray.rcol);
704 >                                                /* -> color */
705 >        scolor_out(col, out_prims, thisray.rcol);
706  
707          return(raydistance(&thisray));          /* return distance */
708   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines