| 459 |
|
return; |
| 460 |
|
} |
| 461 |
|
} |
| 462 |
< |
if (*cp == '+' || *cp == '-') /* f-stops */ |
| 462 |
> |
if ((*cp == '+') | (*cp == '-')) /* f-stops */ |
| 463 |
|
e *= pow(2.0, atof(cp)); |
| 464 |
|
else /* multiplier */ |
| 465 |
|
e *= atof(cp); |
| 755 |
|
{ |
| 756 |
|
RAY thisray; |
| 757 |
|
char buf[512]; |
| 758 |
+ |
COLOR col; |
| 759 |
|
|
| 760 |
|
thisray.rmax = 0.0; |
| 761 |
|
|
| 821 |
|
(*dev->comout)(buf); |
| 822 |
|
} |
| 823 |
|
(*dev->comin)(buf, NULL); |
| 824 |
+ |
scolor_rgb(col, thisray.rcol); |
| 825 |
|
sprintf(buf, "value (%.5g %.5g %.5g) (%.3gL)", |
| 826 |
< |
colval(thisray.rcol,RED), |
| 827 |
< |
colval(thisray.rcol,GRN), |
| 828 |
< |
colval(thisray.rcol,BLU), |
| 829 |
< |
luminance(thisray.rcol)); |
| 826 |
> |
colval(col,RED), |
| 827 |
> |
colval(col,GRN), |
| 828 |
> |
colval(col,BLU), |
| 829 |
> |
luminance(col)); |
| 830 |
|
(*dev->comout)(buf); |
| 831 |
|
} |
| 832 |
|
(*dev->comin)(buf, NULL); |