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

Comparing ray/src/px/pcond3.c (file contents):
Revision 3.1 by greg, Thu Oct 3 16:52:50 1996 UTC vs.
Revision 3.4 by greg, Wed Jan 8 17:57:01 1997 UTC

# Line 13 | Line 13 | static char SCCSid[] = "$SunId$ LBL";
13  
14   #define CVRATIO         0.025           /* fraction of pixels allowed > env. */
15  
16 – #define BotMesopic      5.62e-3         /* top of scotopic range */
17 – #define TopMesopic      5.62            /* bottom of photopic range */
18 –
16   #define exp10(x)        exp(2.302585093*(x))
17  
18   int     modhist[HISTRES];               /* modified histogram */
# Line 60 | Line 57 | double Lw;
57                  return(Bldmin);
58          if (b >= bwmax-FTINY)
59                  return(Bldmax);
60 <        return(Bldmin + cf(Bl(Lw))*(Bldmax-Bldmin));
60 >        return(Bldmin + cf(b)*(Bldmax-Bldmin));
61   }
62  
63  
# Line 180 | Line 177 | int    xres;
177                          incolor = (Lw - BotMesopic) /
178                                          (TopMesopic - BotMesopic);
179                  if (incolor < 1.-FTINY) {
180 +                        b = (1.-incolor)*slum(scan[i])*inpexp/SWNORM;
181 +                        if (lumf == rgblum) b /= WHTEFFICACY;
182 +                        setcolor(ctmp, b, b, b);
183                          if (incolor <= FTINY)
184                                  setcolor(scan[i], 0., 0., 0.);
185                          else
186                                  scalecolor(scan[i], incolor);
187 –                        b = (1.-incolor)*slum(scan[i])*inpexp/SWNORM;
188 –                        if (lumf == rgblum) b /= WHTEFFICACY;
189 –                        setcolor(ctmp, b, b, b);
187                          addcolor(scan[i], ctmp);
188                  }
189          }
# Line 210 | Line 207 | int    xres;
207                  mult = (Lb(b) - ldmin)/(ldmax - ldmin) / (Lw*inpexp);
208                  if (lumf == rgblum) mult *= WHTEFFICACY;
209                  scalecolor(scan[i], mult);
210 +        }
211 + }
212 +
213 +
214 + putmapping(fp)                  /* put out mapping function */
215 + FILE    *fp;
216 + {
217 +        double  b, s;
218 +        register int    i;
219 +        double  wlum, sf;
220 +
221 +        sf = scalef*inpexp;
222 +        if (lumf == cielum) sf *= WHTEFFICACY;
223 +        s = (bwmax - bwmin)/HISTRES;
224 +        for (i = 0, b = bwmin + .5*s; i < HISTRES; i++, b += s) {
225 +                wlum = Lb(b);
226 +                if (what2do&DO_LINEAR)
227 +                        fprintf(fp, "%e %e\n", wlum, sf*wlum);
228 +                else
229 +                        fprintf(fp, "%e %e\n", wlum, Lb(BLw(wlum)));
230          }
231   }
232  

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)