| 10 |
|
* Warping code depends on conformance of COLOR and W3VEC types. |
| 11 |
|
*/ |
| 12 |
|
|
| 13 |
– |
#include <stdio.h> |
| 13 |
|
#include <math.h> |
| 15 |
– |
#include <time.h> |
| 14 |
|
|
| 15 |
|
#include "platform.h" |
| 16 |
+ |
#include "paths.h" |
| 17 |
+ |
#include "rtio.h" |
| 18 |
|
#include "color.h" |
| 19 |
|
#include "resolu.h" |
| 20 |
|
#include "pmap.h" |
| 21 |
|
#include "warp3d.h" |
| 22 |
+ |
#include "mx3.h" |
| 23 |
|
|
| 24 |
|
/* MacBeth colors */ |
| 25 |
|
#define DarkSkin 0 |
| 46 |
|
#define Neutral5 21 |
| 47 |
|
#define Neutral35 22 |
| 48 |
|
#define Black 23 |
| 49 |
< |
/* computed from 5nm spectral measurements */ |
| 49 |
> |
/* computed from 10nm spectral measurements */ |
| 50 |
|
/* CIE 1931 2 degree obs, equal-energy white */ |
| 51 |
|
float mbxyY[24][3] = { |
| 52 |
< |
{0.462, 0.3769, 0.0932961}, /* DarkSkin */ |
| 53 |
< |
{0.4108, 0.3542, 0.410348}, /* LightSkin */ |
| 54 |
< |
{0.2626, 0.267, 0.181554}, /* BlueSky */ |
| 55 |
< |
{0.36, 0.4689, 0.108447}, /* Foliage */ |
| 56 |
< |
{0.2977, 0.2602, 0.248407}, /* BlueFlower */ |
| 57 |
< |
{0.2719, 0.3485, 0.401156}, /* BluishGreen */ |
| 58 |
< |
{0.52, 0.4197, 0.357899}, /* Orange */ |
| 59 |
< |
{0.229, 0.1866, 0.103911}, /* PurplishBlue */ |
| 60 |
< |
{0.4909, 0.3262, 0.242615}, /* ModerateRed */ |
| 61 |
< |
{0.3361, 0.2249, 0.0600102}, /* Purple */ |
| 62 |
< |
{0.3855, 0.4874, 0.42963}, /* YellowGreen */ |
| 63 |
< |
{0.4853, 0.4457, 0.476343}, /* OrangeYellow */ |
| 64 |
< |
{0.2026, 0.1369, 0.0529249}, /* Blue */ |
| 65 |
< |
{0.3007, 0.4822, 0.221226}, /* Green */ |
| 66 |
< |
{0.5805, 0.3238, 0.162167}, /* Red */ |
| 67 |
< |
{0.4617, 0.472, 0.64909}, /* Yellow */ |
| 68 |
< |
{0.4178, 0.2625, 0.233662}, /* Magenta */ |
| 69 |
< |
{0.2038, 0.2508, 0.167275}, /* Cyan */ |
| 70 |
< |
{0.3358, 0.337, 0.916877}, /* White */ |
| 71 |
< |
{0.3338, 0.3348, 0.604678}, /* Neutral.8 */ |
| 72 |
< |
{0.3333, 0.3349, 0.364566}, /* Neutral.65 */ |
| 73 |
< |
{0.3353, 0.3359, 0.200238}, /* Neutral.5 */ |
| 74 |
< |
{0.3363, 0.336, 0.0878721}, /* Neutral.35 */ |
| 75 |
< |
{0.3346, 0.3349, 0.0308383} /* Black */ |
| 52 |
> |
{0.421236, 0.361196, 0.103392}, /* DarkSkin */ |
| 53 |
> |
{0.40868, 0.358157, 0.352867}, /* LightSkin */ |
| 54 |
> |
{0.265063, 0.271424, 0.185124}, /* BlueSky */ |
| 55 |
> |
{0.362851, 0.43055, 0.132625}, /* Foliage */ |
| 56 |
> |
{0.28888, 0.260851, 0.233138}, /* BlueFlower */ |
| 57 |
> |
{0.277642, 0.365326, 0.416443}, /* BluishGreen */ |
| 58 |
> |
{0.524965, 0.40068, 0.312039}, /* Orange */ |
| 59 |
> |
{0.225018, 0.190392, 0.114999}, /* PurplishBlue */ |
| 60 |
> |
{0.487199, 0.315372, 0.198616}, /* ModerateRed */ |
| 61 |
> |
{0.314245, 0.227231, 0.0646047}, /* Purple */ |
| 62 |
> |
{0.396202, 0.489732, 0.440724}, /* YellowGreen */ |
| 63 |
> |
{0.493297, 0.435299, 0.43444}, /* OrangeYellow */ |
| 64 |
> |
{0.198191, 0.149265, 0.0588122}, /* Blue */ |
| 65 |
> |
{0.322838, 0.487601, 0.229258}, /* Green */ |
| 66 |
> |
{0.561833, 0.321165, 0.126978}, /* Red */ |
| 67 |
> |
{0.468113, 0.467021, 0.605289}, /* Yellow */ |
| 68 |
> |
{0.397128, 0.248535, 0.201761}, /* Magenta */ |
| 69 |
> |
{0.209552, 0.276256, 0.190917}, /* Cyan */ |
| 70 |
> |
{0.337219, 0.339042, 0.912482}, /* White */ |
| 71 |
> |
{0.333283, 0.335077, 0.588297}, /* Neutral.8 */ |
| 72 |
> |
{0.332747, 0.334371, 0.3594}, /* Neutral.65 */ |
| 73 |
> |
{0.331925, 0.334202, 0.19114}, /* Neutral.5 */ |
| 74 |
> |
{0.330408, 0.332615, 0.0892964}, /* Neutral.35 */ |
| 75 |
> |
{0.331841, 0.331405, 0.0319541}, /* Black */ |
| 76 |
|
}; |
| 77 |
|
|
| 78 |
|
COLOR mbRGB[24]; /* MacBeth RGB values */ |
| 99 |
|
#define RG_CORR 04 /* corrected color region */ |
| 100 |
|
|
| 101 |
|
#ifndef DISPCOM |
| 102 |
< |
#define DISPCOM "ximage -op %s" |
| 102 |
> |
#define DISPCOM "ximage -e auto -op \"%s\"" |
| 103 |
|
#endif |
| 104 |
|
|
| 105 |
|
int scanning = 1; /* scanned input (or recorded output)? */ |
| 121 |
|
WARP3D *wcor = NULL; /* color space warp */ |
| 122 |
|
|
| 123 |
|
FILE *debugfp = NULL; /* debug output picture */ |
| 123 |
– |
char *progname; |
| 124 |
|
|
| 125 |
+ |
static void init(void); |
| 126 |
+ |
static int chartndx(int x, int y, int *np); |
| 127 |
+ |
static void getpicture(void); |
| 128 |
+ |
static void getcolors(void); |
| 129 |
+ |
static void bresp(COLOR y, COLOR x); |
| 130 |
+ |
static void ibresp(COLOR y, COLOR x); |
| 131 |
+ |
static void compute(void); |
| 132 |
+ |
static void putmapping(void); |
| 133 |
+ |
static void compsoln(COLOR cin[], COLOR cout[], int n); |
| 134 |
+ |
static void cwarp(void); |
| 135 |
+ |
static int cvtcolor(COLOR cout, COLOR cin); |
| 136 |
+ |
static int cresp(COLOR cout, COLOR cin); |
| 137 |
+ |
static void xyY2RGB(COLOR rgbout, float xyYin[3]); |
| 138 |
+ |
static void picdebug(void); |
| 139 |
+ |
static void clrdebug(void); |
| 140 |
+ |
static void getpos(char *name, int bnds[2], FILE *fp); |
| 141 |
+ |
static void pickchartpos(char *pfn); |
| 142 |
|
|
| 143 |
< |
main(argc, argv) |
| 144 |
< |
int argc; |
| 145 |
< |
char **argv; |
| 143 |
> |
|
| 144 |
> |
int |
| 145 |
> |
main( |
| 146 |
> |
int argc, |
| 147 |
> |
char **argv |
| 148 |
> |
) |
| 149 |
|
{ |
| 150 |
|
int i; |
| 151 |
|
|
| 152 |
< |
progname = argv[0]; |
| 152 |
> |
fixargv0(argv[0]); /* sets global progname */ |
| 153 |
|
for (i = 1; i < argc && argv[i][0] == '-'; i++) |
| 154 |
|
switch (argv[i][1]) { |
| 155 |
|
case 'd': /* debug output */ |
| 234 |
|
getcolors(); |
| 235 |
|
compute(); /* compute color mapping */ |
| 236 |
|
if (rawmap) { /* print out raw correspondence */ |
| 237 |
< |
register int j; |
| 237 |
> |
int j; |
| 238 |
|
|
| 239 |
|
printf("# Color correspondence produced by:\n#\t\t"); |
| 240 |
|
printargs(argc, argv, stdout); |
| 241 |
< |
printf("#\tUsage: pcwarp %s uncorrected.pic > corrected.pic\n", |
| 241 |
> |
printf("#\tUsage: pcwarp %s uncorrected.hdr > corrected.hdr\n", |
| 242 |
|
i+1 < argc ? argv[i+1] : "{this_file}"); |
| 243 |
< |
printf("#\t Or: pcond [options] -m %s orig.pic > output.pic\n", |
| 243 |
> |
printf("#\t Or: pcond [options] -m %s orig.hdr > output.hdr\n", |
| 244 |
|
i+1 < argc ? argv[i+1] : "{this_file}"); |
| 245 |
|
for (j = 0; j < 24; j++) |
| 246 |
|
printf("%f %f %f %f %f %f\n", |
| 253 |
|
/* print header */ |
| 254 |
|
printf("{\n\tColor correction file computed by:\n\t\t"); |
| 255 |
|
printargs(argc, argv, stdout); |
| 256 |
< |
printf("\n\tUsage: pcomb -f %s uncorrected.pic > corrected.pic\n", |
| 256 |
> |
printf("\n\tUsage: pcomb -f %s uncorrected.hdr > corrected.hdr\n", |
| 257 |
|
i+1 < argc ? argv[i+1] : "{this_file}"); |
| 258 |
|
if (!scanning) |
| 259 |
< |
printf("\t Or: pcond [options] -f %s orig.pic > output.pic\n", |
| 259 |
> |
printf("\t Or: pcond [options] -f %s orig.hdr > output.hdr\n", |
| 260 |
|
i+1 < argc ? argv[i+1] : "{this_file}"); |
| 261 |
|
printf("}\n"); |
| 262 |
|
putmapping(); /* put out color mapping */ |
| 263 |
|
} |
| 264 |
< |
if (debugfp != NULL) /* put out debug picture */ |
| 264 |
> |
if (debugfp != NULL) { /* put out debug picture */ |
| 265 |
|
if (scanning) |
| 266 |
|
picdebug(); |
| 267 |
|
else |
| 268 |
|
clrdebug(); |
| 269 |
+ |
} |
| 270 |
|
exit(0); |
| 271 |
|
userr: |
| 272 |
|
fprintf(stderr, |
| 273 |
< |
"Usage: %s [-d dbg.pic][-P | -p xul yul xur yur xll yll xlr ylr][-i irrad][-m] input.pic [output.{cal|cwp}]\n", |
| 273 |
> |
"Usage: %s [-d dbg.hdr][-P | -p xul yul xur yur xll yll xlr ylr][-i irrad][-m] input.hdr [output.{cal|cwp}]\n", |
| 274 |
|
progname); |
| 275 |
< |
fprintf(stderr, " or: %s [-d dbg.pic][-i irrad][-m] -c [xyY.dat [output.{cal|cwp}]]\n", |
| 275 |
> |
fprintf(stderr, " or: %s [-d dbg.hdr][-i irrad][-m] -c [xyY.dat [output.{cal|cwp}]]\n", |
| 276 |
|
progname); |
| 277 |
|
exit(1); |
| 278 |
+ |
return 1; /* pro forma return */ |
| 279 |
|
} |
| 280 |
|
|
| 281 |
|
|
| 282 |
< |
init() /* initialize */ |
| 282 |
> |
static void |
| 283 |
> |
init(void) /* initialize */ |
| 284 |
|
{ |
| 285 |
|
double quad[4][2]; |
| 286 |
< |
register int i; |
| 286 |
> |
int i; |
| 287 |
|
/* make coordinate transformation */ |
| 288 |
|
quad[0][0] = bounds[0][0]; |
| 289 |
|
quad[0][1] = bounds[0][1]; |
| 306 |
|
} |
| 307 |
|
|
| 308 |
|
|
| 309 |
< |
int |
| 310 |
< |
chartndx(x, y, np) /* find color number for position */ |
| 311 |
< |
int x, y; |
| 312 |
< |
int *np; |
| 309 |
> |
static int |
| 310 |
> |
chartndx( /* find color number for position */ |
| 311 |
> |
int x, |
| 312 |
> |
int y, |
| 313 |
> |
int *np |
| 314 |
> |
) |
| 315 |
|
{ |
| 316 |
|
double ipos[3], cpos[3]; |
| 317 |
|
int ix, iy; |
| 323 |
|
mx3d_transform(ipos, imgxfm, cpos); |
| 324 |
|
cpos[0] /= cpos[2]; |
| 325 |
|
cpos[1] /= cpos[2]; |
| 326 |
< |
if (cpos[0] < 0. || cpos[0] >= 6. || cpos[1] < 0. || cpos[1] >= 4.) |
| 326 |
> |
if ((cpos[0] < 0.) | (cpos[0] >= 6.) | (cpos[1] < 0.) | (cpos[1] >= 4.)) |
| 327 |
|
return(RG_BORD); |
| 328 |
|
ix = cpos[0]; |
| 329 |
|
iy = cpos[1]; |
| 330 |
|
fx = cpos[0] - ix; |
| 331 |
|
fy = cpos[1] - iy; |
| 332 |
|
*np = iy*6 + ix; |
| 333 |
< |
if (fx >= 0.35 && fx < 0.65 && fy >= 0.35 && fy < 0.65) |
| 333 |
> |
if ((fx >= 0.35) & (fx < 0.65) & (fy >= 0.35) & (fy < 0.65)) |
| 334 |
|
return(RG_CENT); |
| 335 |
< |
if (fx < 0.05 || fx >= 0.95 || fy < 0.05 || fy >= 0.95) |
| 335 |
> |
if ((fx < 0.05) | (fx >= 0.95) | (fy < 0.05) | (fy >= 0.95)) |
| 336 |
|
return(RG_BORD); |
| 337 |
|
if (fx >= 0.5) /* right side is corrected */ |
| 338 |
|
return(RG_CORR); |
| 340 |
|
} |
| 341 |
|
|
| 342 |
|
|
| 343 |
< |
getpicture() /* load in picture colors */ |
| 343 |
> |
static void |
| 344 |
> |
getpicture(void) /* load in picture colors */ |
| 345 |
|
{ |
| 346 |
|
COLR *scanln; |
| 347 |
|
COLOR pval; |
| 348 |
|
int ccount[24]; |
| 349 |
|
double d; |
| 350 |
|
int y, i; |
| 351 |
< |
register int x; |
| 351 |
> |
int x; |
| 352 |
|
|
| 353 |
|
scanln = (COLR *)malloc(xmax*sizeof(COLR)); |
| 354 |
|
if (scanln == NULL) { |
| 383 |
|
} |
| 384 |
|
|
| 385 |
|
|
| 386 |
< |
getcolors() /* get xyY colors from standard input */ |
| 386 |
> |
static void |
| 387 |
> |
getcolors(void) /* get xyY colors from standard input */ |
| 388 |
|
{ |
| 389 |
|
int gotwhite = 0; |
| 390 |
|
COLOR whiteclr; |
| 392 |
|
float xyYin[3]; |
| 393 |
|
|
| 394 |
|
while (fgetval(stdin, 'i', &n) == 1) { /* read colors */ |
| 395 |
< |
if (n < 0 | n > 24 || |
| 395 |
> |
if ((n < 0) | (n > 24) || |
| 396 |
|
fgetval(stdin, 'f', &xyYin[0]) != 1 || |
| 397 |
|
fgetval(stdin, 'f', &xyYin[1]) != 1 || |
| 398 |
|
fgetval(stdin, 'f', &xyYin[2]) != 1 || |
| 399 |
< |
xyYin[0] < 0. | xyYin[1] < 0. || |
| 399 |
> |
(xyYin[0] < 0.) | (xyYin[1] < 0.) || |
| 400 |
|
xyYin[0] + xyYin[1] > 1.) { |
| 401 |
|
fprintf(stderr, "%s: bad color input data\n", |
| 402 |
|
progname); |
| 432 |
|
} |
| 433 |
|
|
| 434 |
|
|
| 435 |
< |
bresp(y, x) /* piecewise linear interpolation of primaries */ |
| 436 |
< |
COLOR y, x; |
| 435 |
> |
static void |
| 436 |
> |
bresp( /* piecewise linear interpolation of primaries */ |
| 437 |
> |
COLOR y, /* y is linear output */ |
| 438 |
> |
COLOR x /* x is non-linear input */ |
| 439 |
> |
) |
| 440 |
|
{ |
| 441 |
< |
register int i, n; |
| 441 |
> |
int i, n; |
| 442 |
|
|
| 443 |
|
for (i = 0; i < 3; i++) { |
| 444 |
|
for (n = 0; n < NMBNEU-2; n++) |
| 453 |
|
} |
| 454 |
|
|
| 455 |
|
|
| 456 |
< |
compute() /* compute color mapping */ |
| 456 |
> |
static void |
| 457 |
> |
ibresp( /* inverse mapping (delinearization) */ |
| 458 |
> |
COLOR x, /* x is non-linear output */ |
| 459 |
> |
COLOR y /* y is linear input */ |
| 460 |
> |
) |
| 461 |
|
{ |
| 462 |
+ |
int i, n; |
| 463 |
+ |
|
| 464 |
+ |
for (i = 0; i < 3; i++) { |
| 465 |
+ |
for (n = 0; n < NMBNEU-2; n++) |
| 466 |
+ |
if (colval(y,i) < colval(bramp[n+1][1],i)) |
| 467 |
+ |
break; |
| 468 |
+ |
colval(x,i) = ((colval(bramp[n+1][1],i) - colval(y,i)) * |
| 469 |
+ |
colval(bramp[n][0],i) + |
| 470 |
+ |
(colval(y,i) - colval(bramp[n][1],i)) * |
| 471 |
+ |
colval(bramp[n+1][0],i)) / |
| 472 |
+ |
(colval(bramp[n+1][1],i) - colval(bramp[n][1],i)); |
| 473 |
+ |
} |
| 474 |
+ |
} |
| 475 |
+ |
|
| 476 |
+ |
|
| 477 |
+ |
static void |
| 478 |
+ |
compute(void) /* compute color mapping */ |
| 479 |
+ |
{ |
| 480 |
|
COLOR clrin[24], clrout[24]; |
| 481 |
|
long cflags; |
| 482 |
|
COLOR ctmp; |
| 483 |
< |
register int i, n; |
| 483 |
> |
int i, n; |
| 484 |
|
/* did we get what we need? */ |
| 485 |
|
if ((inpflags & REQFLGS) != REQFLGS) { |
| 486 |
|
fprintf(stderr, "%s: missing required input colors\n", |
| 490 |
|
/* compute piecewise luminance curve */ |
| 491 |
|
for (i = 0; i < NMBNEU; i++) { |
| 492 |
|
copycolor(bramp[i][0], inpRGB[mbneu[i]]); |
| 493 |
+ |
for (n = 3*(i>0); n--; ) |
| 494 |
+ |
if (colval(bramp[i][0],n) <= |
| 495 |
+ |
colval(bramp[i-1][0],n)+1e-7) { |
| 496 |
+ |
fprintf(stderr, |
| 497 |
+ |
"%s: non-increasing neutral patch\n", progname); |
| 498 |
+ |
exit(1); |
| 499 |
+ |
} |
| 500 |
|
copycolor(bramp[i][1], mbRGB[mbneu[i]]); |
| 501 |
|
} |
| 502 |
|
/* compute color space gamut */ |
| 503 |
< |
if (scanning) { |
| 504 |
< |
copycolor(colmin, cblack); |
| 505 |
< |
copycolor(colmax, cwhite); |
| 506 |
< |
scalecolor(colmax, irrad); |
| 507 |
< |
} else |
| 508 |
< |
for (i = 0; i < 3; i++) { |
| 509 |
< |
colval(colmin,i) = colval(bramp[0][0],i) - |
| 451 |
< |
colval(bramp[0][1],i) * |
| 452 |
< |
(colval(bramp[1][0],i)-colval(bramp[0][0],i)) / |
| 453 |
< |
(colval(bramp[1][1],i)-colval(bramp[1][0],i)); |
| 454 |
< |
colval(colmax,i) = colval(bramp[NMBNEU-2][0],i) + |
| 455 |
< |
(1.-colval(bramp[NMBNEU-2][1],i)) * |
| 456 |
< |
(colval(bramp[NMBNEU-1][0],i) - |
| 457 |
< |
colval(bramp[NMBNEU-2][0],i)) / |
| 458 |
< |
(colval(bramp[NMBNEU-1][1],i) - |
| 459 |
< |
colval(bramp[NMBNEU-2][1],i)); |
| 460 |
< |
} |
| 503 |
> |
copycolor(colmin, cblack); |
| 504 |
> |
copycolor(colmax, cwhite); |
| 505 |
> |
scalecolor(colmax, irrad); |
| 506 |
> |
if (!scanning) { |
| 507 |
> |
ibresp(colmin, colmin); |
| 508 |
> |
ibresp(colmax, colmax); |
| 509 |
> |
} |
| 510 |
|
/* compute color mapping */ |
| 511 |
|
do { |
| 512 |
|
cflags = inpflags & ~gmtflags; |
| 513 |
|
n = 0; /* compute transform matrix */ |
| 514 |
< |
for (i = 0; i < 24; i++) |
| 515 |
< |
if (cflags & 1L<<i) { |
| 514 |
> |
for (i = 0; i < 24; i++) { |
| 515 |
> |
if (!(cflags & 1L<<i)) |
| 516 |
> |
continue; |
| 517 |
> |
if (scanning) { |
| 518 |
|
bresp(clrin[n], inpRGB[i]); |
| 519 |
|
copycolor(clrout[n], mbRGB[i]); |
| 520 |
< |
n++; |
| 520 |
> |
} else { |
| 521 |
> |
copycolor(clrin[n], inpRGB[i]); |
| 522 |
> |
ibresp(clrout[n], mbRGB[i]); |
| 523 |
|
} |
| 524 |
+ |
n++; |
| 525 |
+ |
} |
| 526 |
|
compsoln(clrin, clrout, n); |
| 527 |
< |
if (irrad > 0.99 && irrad < 1.01) /* check gamut */ |
| 528 |
< |
for (i = 0; i < 24; i++) |
| 529 |
< |
if (cflags & 1L<<i && cvtcolor(ctmp, mbRGB[i])) |
| 475 |
< |
gmtflags |= 1L<<i; |
| 527 |
> |
for (i = 0; i < 24; i++) /* check gamut */ |
| 528 |
> |
if (cflags & 1L<<i && cvtcolor(ctmp, inpRGB[i])) |
| 529 |
> |
gmtflags |= 1L<<i; |
| 530 |
|
} while (cflags & gmtflags); |
| 531 |
+ |
|
| 532 |
|
if (gmtflags & MODFLGS) |
| 533 |
|
fprintf(stderr, |
| 534 |
|
"%s: warning - some moderate colors are out of gamut\n", |
| 536 |
|
} |
| 537 |
|
|
| 538 |
|
|
| 539 |
< |
putmapping() /* put out color mapping */ |
| 539 |
> |
static void |
| 540 |
> |
putmapping(void) /* put out color mapping */ |
| 541 |
|
{ |
| 542 |
|
static char cchar[3] = {'r', 'g', 'b'}; |
| 543 |
< |
register int i, j; |
| 543 |
> |
int i, j; |
| 544 |
|
/* print brightness mapping */ |
| 545 |
|
for (j = 0; j < 3; j++) { |
| 546 |
|
printf("%cxa(i) : select(i", cchar[j]); |
| 585 |
|
} |
| 586 |
|
|
| 587 |
|
|
| 588 |
< |
compsoln(cin, cout, n) /* solve 3xN system using least-squares */ |
| 589 |
< |
COLOR cin[], cout[]; |
| 590 |
< |
int n; |
| 588 |
> |
static void |
| 589 |
> |
compsoln( /* solve 3xN system using least-squares */ |
| 590 |
> |
COLOR cin[], |
| 591 |
> |
COLOR cout[], |
| 592 |
> |
int n |
| 593 |
> |
) |
| 594 |
|
{ |
| 595 |
|
extern double mx3d_adjoint(), fabs(); |
| 596 |
|
double mat[3][3], invmat[3][3]; |
| 597 |
|
double det; |
| 598 |
|
double colv[3], rowv[3]; |
| 599 |
< |
register int i, j, k; |
| 599 |
> |
int i, j, k; |
| 600 |
|
|
| 601 |
|
if (n < 3) { |
| 602 |
|
fprintf(stderr, "%s: too few colors to match!\n", progname); |
| 648 |
|
} |
| 649 |
|
|
| 650 |
|
|
| 651 |
< |
cwarp() /* compute color warp map */ |
| 651 |
> |
static void |
| 652 |
> |
cwarp(void) /* compute color warp map */ |
| 653 |
|
{ |
| 654 |
< |
register int i; |
| 654 |
> |
int i; |
| 655 |
|
|
| 656 |
|
if ((wcor = new3dw(W3EXACT)) == NULL) |
| 657 |
|
goto memerr; |
| 665 |
|
} |
| 666 |
|
|
| 667 |
|
|
| 668 |
< |
int |
| 669 |
< |
cvtcolor(cout, cin) /* convert color according to our mapping */ |
| 670 |
< |
COLOR cout, cin; |
| 668 |
> |
static int |
| 669 |
> |
cvtcolor( /* convert color according to our mapping */ |
| 670 |
> |
COLOR cout, |
| 671 |
> |
COLOR cin |
| 672 |
> |
) |
| 673 |
|
{ |
| 674 |
|
COLOR ctmp; |
| 675 |
|
int clipped; |
| 688 |
|
} |
| 689 |
|
|
| 690 |
|
|
| 691 |
< |
int |
| 692 |
< |
cresp(cout, cin) /* transform color according to matrix */ |
| 693 |
< |
COLOR cout, cin; |
| 691 |
> |
static int |
| 692 |
> |
cresp( /* transform color according to matrix */ |
| 693 |
> |
COLOR cout, |
| 694 |
> |
COLOR cin |
| 695 |
> |
) |
| 696 |
|
{ |
| 697 |
|
colortrans(cout, solmat, cin); |
| 698 |
|
return(clipgamut(cout, bright(cout), CGAMUT, colmin, colmax)); |
| 699 |
|
} |
| 700 |
|
|
| 701 |
|
|
| 702 |
< |
xyY2RGB(rgbout, xyYin) /* convert xyY to RGB */ |
| 703 |
< |
COLOR rgbout; |
| 704 |
< |
register float xyYin[3]; |
| 702 |
> |
static void |
| 703 |
> |
xyY2RGB( /* convert xyY to RGB */ |
| 704 |
> |
COLOR rgbout, |
| 705 |
> |
float xyYin[3] |
| 706 |
> |
) |
| 707 |
|
{ |
| 708 |
|
COLOR ctmp; |
| 709 |
|
double d; |
| 717 |
|
} |
| 718 |
|
|
| 719 |
|
|
| 720 |
< |
picdebug() /* put out debugging picture */ |
| 720 |
> |
static void |
| 721 |
> |
picdebug(void) /* put out debugging picture */ |
| 722 |
|
{ |
| 723 |
|
static COLOR blkcol = BLKCOLOR; |
| 724 |
|
COLOR *scan; |
| 725 |
|
int y, i; |
| 726 |
< |
register int x, rg; |
| 726 |
> |
int x, rg; |
| 727 |
|
|
| 728 |
|
if (fseek(stdin, 0L, 0) == EOF) { |
| 729 |
|
fprintf(stderr, "%s: cannot seek on input picture\n", progname); |
| 774 |
|
} |
| 775 |
|
|
| 776 |
|
|
| 777 |
< |
clrdebug() /* put out debug picture from color input */ |
| 777 |
> |
static void |
| 778 |
> |
clrdebug(void) /* put out debug picture from color input */ |
| 779 |
|
{ |
| 780 |
|
static COLR blkclr = BLKCOLR; |
| 781 |
|
COLR mbclr[24], cvclr[24], orclr[24]; |
| 782 |
|
COLR *scan; |
| 783 |
|
COLOR ctmp, ct2; |
| 784 |
|
int y, i; |
| 785 |
< |
register int x, rg; |
| 785 |
> |
int x, rg; |
| 786 |
|
/* convert colors */ |
| 787 |
|
for (i = 0; i < 24; i++) { |
| 788 |
|
copycolor(ctmp, mbRGB[i]); |
| 845 |
|
} |
| 846 |
|
|
| 847 |
|
|
| 848 |
< |
getpos(name, bnds, fp) /* get boundary position */ |
| 849 |
< |
char *name; |
| 850 |
< |
int bnds[2]; |
| 851 |
< |
FILE *fp; |
| 848 |
> |
static void |
| 849 |
> |
getpos( /* get boundary position */ |
| 850 |
> |
char *name, |
| 851 |
> |
int bnds[2], |
| 852 |
> |
FILE *fp |
| 853 |
> |
) |
| 854 |
|
{ |
| 855 |
|
char buf[64]; |
| 856 |
|
|
| 864 |
|
} |
| 865 |
|
|
| 866 |
|
|
| 867 |
< |
pickchartpos(pfn) /* display picture and pick chart location */ |
| 868 |
< |
char *pfn; |
| 867 |
> |
static void |
| 868 |
> |
pickchartpos( /* display picture and pick chart location */ |
| 869 |
> |
char *pfn |
| 870 |
> |
) |
| 871 |
|
{ |
| 872 |
< |
char combuf[512]; |
| 872 |
> |
char combuf[PATH_MAX]; |
| 873 |
|
FILE *pfp; |
| 874 |
|
|
| 875 |
|
sprintf(combuf, DISPCOM, pfn); |
