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

Comparing ray/src/px/macbethcal.c (file contents):
Revision 2.4 by greg, Wed Oct 11 20:48:17 1995 UTC vs.
Revision 2.6 by greg, Tue Oct 17 11:05:17 1995 UTC

# Line 77 | Line 77 | COLOR  mbRGB[24];              /* MacBeth RGB values */
77   #define NMBNEU          6       /* Number of MacBeth neutral colors */
78   short   mbneu[NMBNEU] = {Black,Neutral35,Neutral5,Neutral65,Neutral8,White};
79  
80 < #define NMBMOD          17      /* Number of MacBeth unsaturated colors */
80 > #define NMBMOD          16      /* Number of MacBeth unsaturated colors */
81   short   mbmod[NMBMOD] = {
82                  DarkSkin,LightSkin,BlueSky,Foliage,BlueFlower,BluishGreen,
83 <                Orange,PurplishBlue,ModerateRed,Purple,YellowGreen,
83 >                PurplishBlue,ModerateRed,YellowGreen,OrangeYellow,
84                  Black,Neutral35,Neutral5,Neutral65,Neutral8,White
85          };
86  
87   #define NMBSAT          8       /* Number of MacBeth saturated colors */
88   short   mbsat[NMBSAT] = {
89                  Red,Green,Blue,Magenta,Yellow,Cyan,
90 <                Orange,OrangeYellow
90 >                Orange,Purple
91          };
92  
93   int     xmax, ymax;             /* input image dimensions */
# Line 272 | Line 272 | COLOR  y, x;
272          register int    i, n;
273  
274          for (i = 0; i < 3; i++) {
275 <                n = NMBNEU;
276 <                while (n > 0 && colval(x,i) < colval(bramp[--n][0],i))
277 <                        ;
275 >                for (n = 0; n < NMBNEU-2; n++)
276 >                        if (colval(x,i) < colval(bramp[n+1][0],i))
277 >                                break;
278                  cv[i] = ((colval(bramp[n+1][0],i) - colval(x,i)) *
279                                                  colval(bramp[n][1],i) +
280                                  (colval(x,i) - colval(bramp[n][0],i)) *
# Line 452 | Line 452 | putdebug()                     /* put out debugging picture */
452                  exit(1);
453          }
454                                                  /* finish debug header */
455 +        fputformat(COLRFMT, debugfp);
456          putc('\n', debugfp);
457          fprtresolu(xmax, ymax, debugfp);
458          for (y = ymax-1; y >= 0; y--) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines