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)? */ |
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); |
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]; |
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); |
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) { |
438 |
|
COLOR x |
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++) |
459 |
|
COLOR clrin[24], clrout[24]; |
460 |
|
long cflags; |
461 |
|
COLOR ctmp; |
462 |
< |
register int i, n; |
462 |
> |
int i, n; |
463 |
|
/* did we get what we need? */ |
464 |
|
if ((inpflags & REQFLGS) != REQFLGS) { |
465 |
|
fprintf(stderr, "%s: missing required input colors\n", |
469 |
|
/* compute piecewise luminance curve */ |
470 |
|
for (i = 0; i < NMBNEU; i++) { |
471 |
|
copycolor(bramp[i][0], inpRGB[mbneu[i]]); |
472 |
< |
for (n = i ? 3 : 0; n--; ) |
472 |
> |
for (n = 3*(i>0); n--; ) |
473 |
|
if (colval(bramp[i][0],n) <= |
474 |
|
colval(bramp[i-1][0],n)+1e-7) { |
475 |
|
fprintf(stderr, |
488 |
|
colval(colmin,i) = colval(bramp[0][0],i) - |
489 |
|
colval(bramp[0][1],i) * |
490 |
|
(colval(bramp[1][0],i)-colval(bramp[0][0],i)) / |
491 |
< |
(colval(bramp[1][1],i)-colval(bramp[1][0],i)); |
491 |
> |
(colval(bramp[1][1],i)-colval(bramp[0][1],i)); |
492 |
|
colval(colmax,i) = colval(bramp[NMBNEU-2][0],i) + |
493 |
|
(1.-colval(bramp[NMBNEU-2][1],i)) * |
494 |
|
(colval(bramp[NMBNEU-1][0],i) - |
507 |
|
n++; |
508 |
|
} |
509 |
|
compsoln(clrin, clrout, n); |
510 |
< |
if (irrad > 0.99 && irrad < 1.01) /* check gamut */ |
511 |
< |
for (i = 0; i < 24; i++) |
512 |
< |
if (cflags & 1L<<i && cvtcolor(ctmp, mbRGB[i])) |
513 |
< |
gmtflags |= 1L<<i; |
510 |
> |
for (i = 0; i < 24; i++) /* check gamut */ |
511 |
> |
if (cflags & 1L<<i && cvtcolor(ctmp, inpRGB[i])) |
512 |
> |
gmtflags |= 1L<<i; |
513 |
|
} while (cflags & gmtflags); |
514 |
|
if (gmtflags & MODFLGS) |
515 |
|
fprintf(stderr, |
522 |
|
putmapping(void) /* put out color mapping */ |
523 |
|
{ |
524 |
|
static char cchar[3] = {'r', 'g', 'b'}; |
525 |
< |
register int i, j; |
525 |
> |
int i, j; |
526 |
|
/* print brightness mapping */ |
527 |
|
for (j = 0; j < 3; j++) { |
528 |
|
printf("%cxa(i) : select(i", cchar[j]); |
578 |
|
double mat[3][3], invmat[3][3]; |
579 |
|
double det; |
580 |
|
double colv[3], rowv[3]; |
581 |
< |
register int i, j, k; |
581 |
> |
int i, j, k; |
582 |
|
|
583 |
|
if (n < 3) { |
584 |
|
fprintf(stderr, "%s: too few colors to match!\n", progname); |
633 |
|
static void |
634 |
|
cwarp(void) /* compute color warp map */ |
635 |
|
{ |
636 |
< |
register int i; |
636 |
> |
int i; |
637 |
|
|
638 |
|
if ((wcor = new3dw(W3EXACT)) == NULL) |
639 |
|
goto memerr; |
684 |
|
static void |
685 |
|
xyY2RGB( /* convert xyY to RGB */ |
686 |
|
COLOR rgbout, |
687 |
< |
register float xyYin[3] |
687 |
> |
float xyYin[3] |
688 |
|
) |
689 |
|
{ |
690 |
|
COLOR ctmp; |
705 |
|
static COLOR blkcol = BLKCOLOR; |
706 |
|
COLOR *scan; |
707 |
|
int y, i; |
708 |
< |
register int x, rg; |
708 |
> |
int x, rg; |
709 |
|
|
710 |
|
if (fseek(stdin, 0L, 0) == EOF) { |
711 |
|
fprintf(stderr, "%s: cannot seek on input picture\n", progname); |
764 |
|
COLR *scan; |
765 |
|
COLOR ctmp, ct2; |
766 |
|
int y, i; |
767 |
< |
register int x, rg; |
767 |
> |
int x, rg; |
768 |
|
/* convert colors */ |
769 |
|
for (i = 0; i < 24; i++) { |
770 |
|
copycolor(ctmp, mbRGB[i]); |