| 48 |
|
#define Neutral5 21 |
| 49 |
|
#define Neutral35 22 |
| 50 |
|
#define Black 23 |
| 51 |
< |
/* computed from 5nm spectral measurements */ |
| 51 |
> |
/* computed from 10nm spectral measurements */ |
| 52 |
|
/* CIE 1931 2 degree obs, equal-energy white */ |
| 53 |
|
float mbxyY[24][3] = { |
| 54 |
< |
{0.462, 0.3769, 0.0932961}, /* DarkSkin */ |
| 55 |
< |
{0.4108, 0.3542, 0.410348}, /* LightSkin */ |
| 56 |
< |
{0.2626, 0.267, 0.181554}, /* BlueSky */ |
| 57 |
< |
{0.36, 0.4689, 0.108447}, /* Foliage */ |
| 58 |
< |
{0.2977, 0.2602, 0.248407}, /* BlueFlower */ |
| 59 |
< |
{0.2719, 0.3485, 0.401156}, /* BluishGreen */ |
| 60 |
< |
{0.52, 0.4197, 0.357899}, /* Orange */ |
| 61 |
< |
{0.229, 0.1866, 0.103911}, /* PurplishBlue */ |
| 62 |
< |
{0.4909, 0.3262, 0.242615}, /* ModerateRed */ |
| 63 |
< |
{0.3361, 0.2249, 0.0600102}, /* Purple */ |
| 64 |
< |
{0.3855, 0.4874, 0.42963}, /* YellowGreen */ |
| 65 |
< |
{0.4853, 0.4457, 0.476343}, /* OrangeYellow */ |
| 66 |
< |
{0.2026, 0.1369, 0.0529249}, /* Blue */ |
| 67 |
< |
{0.3007, 0.4822, 0.221226}, /* Green */ |
| 68 |
< |
{0.5805, 0.3238, 0.162167}, /* Red */ |
| 69 |
< |
{0.4617, 0.472, 0.64909}, /* Yellow */ |
| 70 |
< |
{0.4178, 0.2625, 0.233662}, /* Magenta */ |
| 71 |
< |
{0.2038, 0.2508, 0.167275}, /* Cyan */ |
| 72 |
< |
{0.3358, 0.337, 0.916877}, /* White */ |
| 73 |
< |
{0.3338, 0.3348, 0.604678}, /* Neutral.8 */ |
| 74 |
< |
{0.3333, 0.3349, 0.364566}, /* Neutral.65 */ |
| 75 |
< |
{0.3353, 0.3359, 0.200238}, /* Neutral.5 */ |
| 76 |
< |
{0.3363, 0.336, 0.0878721}, /* Neutral.35 */ |
| 77 |
< |
{0.3346, 0.3349, 0.0308383} /* Black */ |
| 54 |
> |
{0.421236, 0.361196, 0.103392}, /* DarkSkin */ |
| 55 |
> |
{0.40868, 0.358157, 0.352867}, /* LightSkin */ |
| 56 |
> |
{0.265063, 0.271424, 0.185124}, /* BlueSky */ |
| 57 |
> |
{0.362851, 0.43055, 0.132625}, /* Foliage */ |
| 58 |
> |
{0.28888, 0.260851, 0.233138}, /* BlueFlower */ |
| 59 |
> |
{0.277642, 0.365326, 0.416443}, /* BluishGreen */ |
| 60 |
> |
{0.524965, 0.40068, 0.312039}, /* Orange */ |
| 61 |
> |
{0.225018, 0.190392, 0.114999}, /* PurplishBlue */ |
| 62 |
> |
{0.487199, 0.315372, 0.198616}, /* ModerateRed */ |
| 63 |
> |
{0.314245, 0.227231, 0.0646047}, /* Purple */ |
| 64 |
> |
{0.396202, 0.489732, 0.440724}, /* YellowGreen */ |
| 65 |
> |
{0.493297, 0.435299, 0.43444}, /* OrangeYellow */ |
| 66 |
> |
{0.198191, 0.149265, 0.0588122}, /* Blue */ |
| 67 |
> |
{0.322838, 0.487601, 0.229258}, /* Green */ |
| 68 |
> |
{0.561833, 0.321165, 0.126978}, /* Red */ |
| 69 |
> |
{0.468113, 0.467021, 0.605289}, /* Yellow */ |
| 70 |
> |
{0.397128, 0.248535, 0.201761}, /* Magenta */ |
| 71 |
> |
{0.209552, 0.276256, 0.190917}, /* Cyan */ |
| 72 |
> |
{0.337219, 0.339042, 0.912482}, /* White */ |
| 73 |
> |
{0.333283, 0.335077, 0.588297}, /* Neutral.8 */ |
| 74 |
> |
{0.332747, 0.334371, 0.3594}, /* Neutral.65 */ |
| 75 |
> |
{0.331925, 0.334202, 0.19114}, /* Neutral.5 */ |
| 76 |
> |
{0.330408, 0.332615, 0.0892964}, /* Neutral.35 */ |
| 77 |
> |
{0.331841, 0.331405, 0.0319541}, /* Black */ |
| 78 |
|
}; |
| 79 |
|
|
| 80 |
|
COLOR mbRGB[24]; /* MacBeth RGB values */ |
| 240 |
|
|
| 241 |
|
printf("# Color correspondence produced by:\n#\t\t"); |
| 242 |
|
printargs(argc, argv, stdout); |
| 243 |
< |
printf("#\tUsage: pcwarp %s uncorrected.pic > corrected.pic\n", |
| 243 |
> |
printf("#\tUsage: pcwarp %s uncorrected.hdr > corrected.hdr\n", |
| 244 |
|
i+1 < argc ? argv[i+1] : "{this_file}"); |
| 245 |
< |
printf("#\t Or: pcond [options] -m %s orig.pic > output.pic\n", |
| 245 |
> |
printf("#\t Or: pcond [options] -m %s orig.hdr > output.hdr\n", |
| 246 |
|
i+1 < argc ? argv[i+1] : "{this_file}"); |
| 247 |
|
for (j = 0; j < 24; j++) |
| 248 |
|
printf("%f %f %f %f %f %f\n", |
| 255 |
|
/* print header */ |
| 256 |
|
printf("{\n\tColor correction file computed by:\n\t\t"); |
| 257 |
|
printargs(argc, argv, stdout); |
| 258 |
< |
printf("\n\tUsage: pcomb -f %s uncorrected.pic > corrected.pic\n", |
| 258 |
> |
printf("\n\tUsage: pcomb -f %s uncorrected.hdr > corrected.hdr\n", |
| 259 |
|
i+1 < argc ? argv[i+1] : "{this_file}"); |
| 260 |
|
if (!scanning) |
| 261 |
< |
printf("\t Or: pcond [options] -f %s orig.pic > output.pic\n", |
| 261 |
> |
printf("\t Or: pcond [options] -f %s orig.hdr > output.hdr\n", |
| 262 |
|
i+1 < argc ? argv[i+1] : "{this_file}"); |
| 263 |
|
printf("}\n"); |
| 264 |
|
putmapping(); /* put out color mapping */ |
| 272 |
|
exit(0); |
| 273 |
|
userr: |
| 274 |
|
fprintf(stderr, |
| 275 |
< |
"Usage: %s [-d dbg.pic][-P | -p xul yul xur yur xll yll xlr ylr][-i irrad][-m] input.pic [output.{cal|cwp}]\n", |
| 275 |
> |
"Usage: %s [-d dbg.hdr][-P | -p xul yul xur yur xll yll xlr ylr][-i irrad][-m] input.hdr [output.{cal|cwp}]\n", |
| 276 |
|
progname); |
| 277 |
< |
fprintf(stderr, " or: %s [-d dbg.pic][-i irrad][-m] -c [xyY.dat [output.{cal|cwp}]]\n", |
| 277 |
> |
fprintf(stderr, " or: %s [-d dbg.hdr][-i irrad][-m] -c [xyY.dat [output.{cal|cwp}]]\n", |
| 278 |
|
progname); |
| 279 |
|
exit(1); |
| 280 |
|
return 1; /* pro forma return */ |
| 471 |
|
/* compute piecewise luminance curve */ |
| 472 |
|
for (i = 0; i < NMBNEU; i++) { |
| 473 |
|
copycolor(bramp[i][0], inpRGB[mbneu[i]]); |
| 474 |
+ |
for (n = i ? 3 : 0; n--; ) |
| 475 |
+ |
if (colval(bramp[i][0],n) <= |
| 476 |
+ |
colval(bramp[i-1][0],n)+1e-7) { |
| 477 |
+ |
fprintf(stderr, |
| 478 |
+ |
"%s: non-increasing neutral patch\n", progname); |
| 479 |
+ |
exit(1); |
| 480 |
+ |
} |
| 481 |
|
copycolor(bramp[i][1], mbRGB[mbneu[i]]); |
| 482 |
|
} |
| 483 |
|
/* compute color space gamut */ |
