1 |
< |
/* Copyright (c) 1995 Regents of the University of California */ |
1 |
> |
/* Copyright (c) 1997 Regents of the University of California */ |
2 |
|
|
3 |
|
#ifndef lint |
4 |
|
static char SCCSid[] = "$SunId$ LBL"; |
7 |
|
/* |
8 |
|
* Calibrate a scanned MacBeth Color Checker Chart |
9 |
|
* |
10 |
< |
* Produce a .cal file suitable for use with pcomb. |
10 |
> |
* Produce a .cal file suitable for use with pcomb, |
11 |
> |
* or .cwp file suitable for use with pcwarp. |
12 |
> |
* |
13 |
> |
* Warping code depends on conformance of COLOR and W3VEC types. |
14 |
|
*/ |
15 |
|
|
16 |
|
#include <stdio.h> |
17 |
+ |
#include <math.h> |
18 |
|
#ifdef MSDOS |
19 |
|
#include <fcntl.h> |
20 |
|
#endif |
21 |
|
#include "color.h" |
22 |
|
#include "resolu.h" |
23 |
|
#include "pmap.h" |
24 |
+ |
#include "warp3d.h" |
25 |
|
|
26 |
|
/* MacBeth colors */ |
27 |
|
#define DarkSkin 0 |
95 |
|
#define REQFLGS NEUFLGS /* need these colors */ |
96 |
|
#define MODFLGS (NEUFLGS|UNSFLGS) /* should be in gamut */ |
97 |
|
|
98 |
< |
#define CENTCVG 0.3 /* measured coverage of square sample */ |
99 |
< |
#define FULLCVG 0.9 /* coverage of entire square */ |
98 |
> |
#define RG_BORD 0 /* patch border */ |
99 |
> |
#define RG_CENT 01 /* central region of patch */ |
100 |
> |
#define RG_ORIG 02 /* original color region */ |
101 |
> |
#define RG_CORR 04 /* corrected color region */ |
102 |
|
|
103 |
+ |
int scanning = 1; /* scanned input (or recorded output)? */ |
104 |
+ |
double irrad = 1.0; /* irradiance multiplication factor */ |
105 |
+ |
int rawmap = 0; /* put out raw color mapping? */ |
106 |
+ |
|
107 |
|
int xmax, ymax; /* input image dimensions */ |
108 |
|
int bounds[4][2]; /* image coordinates of chart corners */ |
109 |
|
double imgxfm[3][3]; /* coordinate transformation matrix */ |
113 |
|
long gmtflags = 0; /* flags of out-of-gamut colors */ |
114 |
|
|
115 |
|
COLOR bramp[NMBNEU][2]; /* brightness ramp (per primary) */ |
116 |
< |
double solmat[3][3]; /* color mapping matrix */ |
116 |
> |
COLORMAT solmat; /* color mapping matrix */ |
117 |
> |
COLOR colmin, colmax; /* gamut limits */ |
118 |
|
|
119 |
+ |
WARP3D *wcor = NULL; /* color space warp */ |
120 |
+ |
|
121 |
|
FILE *debugfp = NULL; /* debug output picture */ |
122 |
|
char *progname; |
123 |
|
|
128 |
|
int argc; |
129 |
|
char **argv; |
130 |
|
{ |
117 |
– |
int inpispic = 1; |
131 |
|
int i; |
132 |
|
|
133 |
|
progname = argv[0]; |
158 |
|
bounds[2][1] = atoi(argv[++i]); |
159 |
|
bounds[3][0] = atoi(argv[++i]); |
160 |
|
bounds[3][1] = atoi(argv[++i]); |
161 |
< |
inpispic = 2; |
161 |
> |
scanning = 2; |
162 |
|
break; |
163 |
+ |
case 'i': /* irradiance factor */ |
164 |
+ |
i++; |
165 |
+ |
if (badarg(argc-i, argv+i, "f")) |
166 |
+ |
goto userr; |
167 |
+ |
irrad = atof(argv[i]); |
168 |
+ |
break; |
169 |
+ |
case 'm': /* raw map output */ |
170 |
+ |
rawmap = 1; |
171 |
+ |
break; |
172 |
|
case 'c': /* color input */ |
173 |
< |
inpispic = 0; |
173 |
> |
scanning = 0; |
174 |
|
break; |
175 |
|
default: |
176 |
|
goto userr; |
177 |
|
} |
178 |
|
/* open files */ |
179 |
|
if (i < argc && freopen(argv[i], "r", stdin) == NULL) { |
180 |
< |
perror(argv[1]); |
180 |
> |
perror(argv[i]); |
181 |
|
exit(1); |
182 |
|
} |
183 |
|
if (i+1 < argc && freopen(argv[i+1], "w", stdout) == NULL) { |
184 |
< |
perror(argv[2]); |
184 |
> |
perror(argv[i+1]); |
185 |
|
exit(1); |
186 |
|
} |
187 |
< |
if (inpispic) { /* load input picture header */ |
187 |
> |
if (scanning) { /* load input picture header */ |
188 |
|
#ifdef MSDOS |
189 |
|
setmode(fileno(stdin), O_BINARY); |
190 |
|
#endif |
197 |
|
xmax = 512; |
198 |
|
ymax = 2*512/3; |
199 |
|
} |
200 |
< |
if (inpispic != 2) { /* use default boundaries */ |
200 |
> |
if (scanning != 2) { /* use default boundaries */ |
201 |
|
bounds[0][0] = bounds[2][0] = .029*xmax + .5; |
202 |
|
bounds[0][1] = bounds[1][1] = .956*ymax + .5; |
203 |
|
bounds[1][0] = bounds[3][0] = .971*xmax + .5; |
204 |
|
bounds[2][1] = bounds[3][1] = .056*ymax + .5; |
205 |
|
} |
206 |
|
init(); /* initialize */ |
207 |
< |
if (inpispic) /* get picture colors */ |
207 |
> |
if (scanning) /* get picture colors */ |
208 |
|
getpicture(); |
209 |
|
else |
210 |
|
getcolors(); |
211 |
|
compute(); /* compute color mapping */ |
212 |
< |
/* print comment */ |
213 |
< |
printf("{ Color correction file computed by:\n\t"); |
214 |
< |
printargs(argc, argv, stdout); |
215 |
< |
printf("}\n"); |
216 |
< |
putmapping(); /* put out color mapping */ |
212 |
> |
if (rawmap) { /* print out raw correspondence */ |
213 |
> |
register int j; |
214 |
> |
|
215 |
> |
printf("# Color correspondence produced by:\n#\t\t"); |
216 |
> |
printargs(argc, argv, stdout); |
217 |
> |
printf("#\tUsage: pcwarp %s uncorrected.pic > corrected.pic\n", |
218 |
> |
i+1 < argc ? argv[i+1] : "{this_file}"); |
219 |
> |
printf("#\t Or: pcond [options] -m %s orig.pic > output.pic\n", |
220 |
> |
i+1 < argc ? argv[i+1] : "{this_file}"); |
221 |
> |
for (j = 0; j < 24; j++) |
222 |
> |
printf("%f %f %f %f %f %f\n", |
223 |
> |
colval(inpRGB[j],RED), colval(inpRGB[j],GRN), |
224 |
> |
colval(inpRGB[j],BLU), colval(mbRGB[j],RED), |
225 |
> |
colval(mbRGB[j],GRN), colval(mbRGB[j],BLU)); |
226 |
> |
if (scanning && debugfp != NULL) |
227 |
> |
cwarp(); /* color warp for debugging */ |
228 |
> |
} else { /* print color mapping */ |
229 |
> |
/* print header */ |
230 |
> |
printf("{\n\tColor correction file computed by:\n\t\t"); |
231 |
> |
printargs(argc, argv, stdout); |
232 |
> |
printf("\n\tUsage: pcomb -f %s uncorrected.pic > corrected.pic\n", |
233 |
> |
i+1 < argc ? argv[i+1] : "{this_file}"); |
234 |
> |
if (!scanning) |
235 |
> |
printf("\t Or: pcond [options] -f %s orig.pic > output.pic\n", |
236 |
> |
i+1 < argc ? argv[i+1] : "{this_file}"); |
237 |
> |
printf("}\n"); |
238 |
> |
putmapping(); /* put out color mapping */ |
239 |
> |
} |
240 |
|
if (debugfp != NULL) /* put out debug picture */ |
241 |
< |
if (inpispic) |
241 |
> |
if (scanning) |
242 |
|
picdebug(); |
243 |
|
else |
244 |
|
clrdebug(); |
245 |
|
exit(0); |
246 |
|
userr: |
247 |
|
fprintf(stderr, |
248 |
< |
"Usage: %s [-d dbg.pic][-p xul yul xur yur xll yll xlr ylr] input.pic [output.cal]\n", |
248 |
> |
"Usage: %s [-d dbg.pic][-p xul yul xur yur xll yll xlr ylr][-i irrad][-m] input.pic [output.{cal|cwp}]\n", |
249 |
|
progname); |
250 |
< |
fprintf(stderr, " or: %s [-d dbg.pic] -c [xyY.dat [output.cal]]\n", |
250 |
> |
fprintf(stderr, " or: %s [-d dbg.pic][-i irrad][-m] -c [xyY.dat [output.{cal|cwp}]]\n", |
251 |
|
progname); |
252 |
|
exit(1); |
253 |
|
} |
272 |
|
exit(1); |
273 |
|
} |
274 |
|
/* map MacBeth colors to RGB space */ |
275 |
< |
for (i = 0; i < 24; i++) |
275 |
> |
for (i = 0; i < 24; i++) { |
276 |
|
xyY2RGB(mbRGB[i], mbxyY[i]); |
277 |
+ |
scalecolor(mbRGB[i], irrad); |
278 |
+ |
} |
279 |
|
} |
280 |
|
|
281 |
|
|
282 |
|
int |
283 |
< |
chartndx(x, y, cvg) /* find color number for position */ |
283 |
> |
chartndx(x, y, np) /* find color number for position */ |
284 |
|
int x, y; |
285 |
< |
double cvg; |
285 |
> |
int *np; |
286 |
|
{ |
287 |
|
double ipos[3], cpos[3]; |
288 |
|
int ix, iy; |
289 |
|
double fx, fy; |
243 |
– |
double cmin, cmax; |
290 |
|
|
291 |
|
ipos[0] = x; |
292 |
|
ipos[1] = y; |
295 |
|
cpos[0] /= cpos[2]; |
296 |
|
cpos[1] /= cpos[2]; |
297 |
|
if (cpos[0] < 0. || cpos[0] >= 6. || cpos[1] < 0. || cpos[1] >= 4.) |
298 |
< |
return(-1); |
298 |
> |
return(RG_BORD); |
299 |
|
ix = cpos[0]; |
300 |
|
iy = cpos[1]; |
301 |
|
fx = cpos[0] - ix; |
302 |
|
fy = cpos[1] - iy; |
303 |
< |
cmin = .5*(1.-cvg); |
304 |
< |
cmax = 1. - cmin; |
305 |
< |
if (fx < cmin || fx >= cmax || fy < cmin || fy >= cmax) |
306 |
< |
return(-1); |
307 |
< |
return(iy*6 + ix); |
303 |
> |
*np = iy*6 + ix; |
304 |
> |
if (fx >= 0.35 && fx < 0.65 && fy >= 0.35 && fy < 0.65) |
305 |
> |
return(RG_CENT); |
306 |
> |
if (fx < 0.05 || fx >= 0.95 || fy < 0.05 || fy >= 0.95) |
307 |
> |
return(RG_BORD); |
308 |
> |
if (fx >= 0.5) /* right side is corrected */ |
309 |
> |
return(RG_CORR); |
310 |
> |
return(RG_ORIG); /* left side is original */ |
311 |
|
} |
312 |
|
|
313 |
|
|
317 |
|
COLOR pval; |
318 |
|
int ccount[24]; |
319 |
|
double d; |
320 |
< |
int y; |
321 |
< |
register int x, i; |
320 |
> |
int y, i; |
321 |
> |
register int x; |
322 |
|
|
323 |
|
scanln = (COLR *)malloc(xmax*sizeof(COLR)); |
324 |
|
if (scanln == NULL) { |
335 |
|
progname); |
336 |
|
exit(1); |
337 |
|
} |
338 |
< |
for (x = 0; x < xmax; x++) { |
339 |
< |
i = chartndx(x, y, CENTCVG); |
291 |
< |
if (i >= 0) { |
338 |
> |
for (x = 0; x < xmax; x++) |
339 |
> |
if (chartndx(x, y, &i) == RG_CENT) { |
340 |
|
colr_color(pval, scanln[x]); |
341 |
|
addcolor(inpRGB[i], pval); |
342 |
|
ccount[i]++; |
343 |
|
} |
296 |
– |
} |
344 |
|
} |
345 |
|
for (i = 0; i < 24; i++) { /* compute averages */ |
346 |
|
if (ccount[i] == 0) |
365 |
|
fgetval(stdin, 'f', &xyYin[0]) != 1 || |
366 |
|
fgetval(stdin, 'f', &xyYin[1]) != 1 || |
367 |
|
fgetval(stdin, 'f', &xyYin[2]) != 1 || |
368 |
< |
xyYin[0] < 0. | xyYin[0] > 1. | |
369 |
< |
xyYin[1] < 0. | xyYin[1] > 1.) { |
368 |
> |
xyYin[0] < 0. | xyYin[1] < 0. || |
369 |
> |
xyYin[0] + xyYin[1] > 1.) { |
370 |
|
fprintf(stderr, "%s: bad color input data\n", |
371 |
|
progname); |
372 |
|
exit(1); |
424 |
|
COLOR clrin[24], clrout[24]; |
425 |
|
long cflags; |
426 |
|
COLOR ctmp; |
427 |
< |
register int i, j, n; |
427 |
> |
register int i, n; |
428 |
|
/* did we get what we need? */ |
429 |
|
if ((inpflags & REQFLGS) != REQFLGS) { |
430 |
|
fprintf(stderr, "%s: missing required input colors\n", |
436 |
|
copycolor(bramp[i][0], inpRGB[mbneu[i]]); |
437 |
|
copycolor(bramp[i][1], mbRGB[mbneu[i]]); |
438 |
|
} |
439 |
+ |
/* compute color space gamut */ |
440 |
+ |
if (scanning) { |
441 |
+ |
copycolor(colmin, cblack); |
442 |
+ |
copycolor(colmax, cwhite); |
443 |
+ |
scalecolor(colmax, irrad); |
444 |
+ |
} else |
445 |
+ |
for (i = 0; i < 3; i++) { |
446 |
+ |
colval(colmin,i) = colval(bramp[0][0],i) - |
447 |
+ |
colval(bramp[0][1],i) * |
448 |
+ |
(colval(bramp[1][0],i)-colval(bramp[0][0],i)) / |
449 |
+ |
(colval(bramp[1][1],i)-colval(bramp[1][0],i)); |
450 |
+ |
colval(colmax,i) = colval(bramp[NMBNEU-2][0],i) + |
451 |
+ |
(1.-colval(bramp[NMBNEU-2][1],i)) * |
452 |
+ |
(colval(bramp[NMBNEU-1][0],i) - |
453 |
+ |
colval(bramp[NMBNEU-2][0],i)) / |
454 |
+ |
(colval(bramp[NMBNEU-1][1],i) - |
455 |
+ |
colval(bramp[NMBNEU-2][1],i)); |
456 |
+ |
} |
457 |
|
/* compute color mapping */ |
458 |
|
do { |
459 |
|
cflags = inpflags & ~gmtflags; |
465 |
|
n++; |
466 |
|
} |
467 |
|
compsoln(clrin, clrout, n); |
468 |
< |
/* check out-of-gamut colors */ |
469 |
< |
for (i = 0; i < 24; i++) |
470 |
< |
if (cflags & 1L<<i) { |
471 |
< |
cresp(ctmp, mbRGB[i]); |
407 |
< |
for (j = 0; j < 3; j++) |
408 |
< |
if (colval(ctmp,j) <= 0. || |
409 |
< |
colval(ctmp,j) >= 1.) { |
410 |
< |
gmtflags |= 1L<<i; |
411 |
< |
break; |
412 |
< |
} |
413 |
< |
} |
468 |
> |
if (irrad > 0.99 && irrad < 1.01) /* check gamut */ |
469 |
> |
for (i = 0; i < 24; i++) |
470 |
> |
if (cflags & 1L<<i && cvtcolor(ctmp, mbRGB[i])) |
471 |
> |
gmtflags |= 1L<<i; |
472 |
|
} while (cflags & gmtflags); |
473 |
|
if (gmtflags & MODFLGS) |
474 |
|
fprintf(stderr, |
477 |
|
} |
478 |
|
|
479 |
|
|
480 |
< |
putmapping() /* put out color mapping for pcomb -f */ |
480 |
> |
putmapping() /* put out color mapping */ |
481 |
|
{ |
482 |
|
static char cchar[3] = {'r', 'g', 'b'}; |
483 |
|
register int i, j; |
491 |
|
for (i = 0; i < NMBNEU; i++) |
492 |
|
printf(",%g", colval(bramp[i][1],j)); |
493 |
|
printf(");\n"); |
436 |
– |
printf("%c = %ci(1);\n", cchar[j], cchar[j]); |
494 |
|
printf("%cfi(n) = if(n-%g, %d, if(%cxa(n+1)-%c, n, %cfi(n+1)));\n", |
495 |
|
cchar[j], NMBNEU-1.5, NMBNEU-1, cchar[j], |
496 |
|
cchar[j], cchar[j]); |
497 |
|
printf("%cndx = %cfi(1);\n", cchar[j], cchar[j]); |
498 |
< |
printf("%cn = ((%cxa(%cndx+1)-%c)*%cya(%cndx) + ", |
499 |
< |
cchar[j], cchar[j], cchar[j], |
500 |
< |
cchar[j], cchar[j], cchar[j]); |
498 |
> |
printf("%c%c = ((%cxa(%cndx+1)-%c)*%cya(%cndx) + ", |
499 |
> |
cchar[j], scanning?'n':'o', cchar[j], |
500 |
> |
cchar[j], cchar[j], cchar[j], cchar[j]); |
501 |
|
printf("(%c-%cxa(%cndx))*%cya(%cndx+1)) /\n", |
502 |
|
cchar[j], cchar[j], cchar[j], |
503 |
|
cchar[j], cchar[j]); |
505 |
|
cchar[j], cchar[j], cchar[j], cchar[j]); |
506 |
|
} |
507 |
|
/* print color mapping */ |
508 |
< |
printf("ro = %g*rn + %g*gn + %g*bn ;\n", |
509 |
< |
solmat[0][0], solmat[0][1], solmat[0][2]); |
510 |
< |
printf("go = %g*rn + %g*gn + %g*bn ;\n", |
511 |
< |
solmat[1][0], solmat[1][1], solmat[1][2]); |
512 |
< |
printf("bo = %g*rn + %g*gn + %g*bn ;\n", |
513 |
< |
solmat[2][0], solmat[2][1], solmat[2][2]); |
508 |
> |
if (scanning) { |
509 |
> |
printf("r = ri(1); g = gi(1); b = bi(1);\n"); |
510 |
> |
printf("ro = %g*rn + %g*gn + %g*bn ;\n", |
511 |
> |
solmat[0][0], solmat[0][1], solmat[0][2]); |
512 |
> |
printf("go = %g*rn + %g*gn + %g*bn ;\n", |
513 |
> |
solmat[1][0], solmat[1][1], solmat[1][2]); |
514 |
> |
printf("bo = %g*rn + %g*gn + %g*bn ;\n", |
515 |
> |
solmat[2][0], solmat[2][1], solmat[2][2]); |
516 |
> |
} else { |
517 |
> |
printf("r1 = ri(1); g1 = gi(1); b1 = bi(1);\n"); |
518 |
> |
printf("r = %g*r1 + %g*g1 + %g*b1 ;\n", |
519 |
> |
solmat[0][0], solmat[0][1], solmat[0][2]); |
520 |
> |
printf("g = %g*r1 + %g*g1 + %g*b1 ;\n", |
521 |
> |
solmat[1][0], solmat[1][1], solmat[1][2]); |
522 |
> |
printf("b = %g*r1 + %g*g1 + %g*b1 ;\n", |
523 |
> |
solmat[2][0], solmat[2][1], solmat[2][2]); |
524 |
> |
} |
525 |
|
} |
526 |
|
|
527 |
|
|
585 |
|
} |
586 |
|
|
587 |
|
|
588 |
+ |
cwarp() /* compute color warp map */ |
589 |
+ |
{ |
590 |
+ |
register int i; |
591 |
+ |
|
592 |
+ |
if ((wcor = new3dw(W3EXACT)) == NULL) |
593 |
+ |
goto memerr; |
594 |
+ |
for (i = 0; i < 24; i++) |
595 |
+ |
if (!add3dpt(wcor, inpRGB[i], mbRGB[i])) |
596 |
+ |
goto memerr; |
597 |
+ |
return; |
598 |
+ |
memerr: |
599 |
+ |
perror(progname); |
600 |
+ |
exit(1); |
601 |
+ |
} |
602 |
+ |
|
603 |
+ |
|
604 |
+ |
int |
605 |
|
cvtcolor(cout, cin) /* convert color according to our mapping */ |
606 |
|
COLOR cout, cin; |
607 |
|
{ |
608 |
|
COLOR ctmp; |
609 |
+ |
int clipped; |
610 |
|
|
611 |
< |
bresp(ctmp, cin); |
612 |
< |
cresp(cout, ctmp); |
613 |
< |
if (colval(cout,RED) < 0.) |
614 |
< |
colval(cout,RED) = 0.; |
615 |
< |
if (colval(cout,GRN) < 0.) |
616 |
< |
colval(cout,GRN) = 0.; |
617 |
< |
if (colval(cout,BLU) < 0.) |
618 |
< |
colval(cout,BLU) = 0.; |
611 |
> |
if (wcor != NULL) { |
612 |
> |
clipped = warp3d(cout, cin, wcor); |
613 |
> |
clipped |= clipgamut(cout,bright(cout),CGAMUT,colmin,colmax); |
614 |
> |
} else if (scanning) { |
615 |
> |
bresp(ctmp, cin); |
616 |
> |
clipped = cresp(cout, ctmp); |
617 |
> |
} else { |
618 |
> |
clipped = cresp(ctmp, cin); |
619 |
> |
bresp(cout, ctmp); |
620 |
> |
} |
621 |
> |
return(clipped); |
622 |
|
} |
623 |
|
|
624 |
|
|
625 |
+ |
int |
626 |
|
cresp(cout, cin) /* transform color according to matrix */ |
627 |
|
COLOR cout, cin; |
628 |
|
{ |
629 |
< |
double r, g, b; |
630 |
< |
|
541 |
< |
r = colval(cin,0)*solmat[0][0] + colval(cin,1)*solmat[0][1] |
542 |
< |
+ colval(cin,2)*solmat[0][2]; |
543 |
< |
g = colval(cin,0)*solmat[1][0] + colval(cin,1)*solmat[1][1] |
544 |
< |
+ colval(cin,2)*solmat[1][2]; |
545 |
< |
b = colval(cin,0)*solmat[2][0] + colval(cin,1)*solmat[2][1] |
546 |
< |
+ colval(cin,2)*solmat[2][2]; |
547 |
< |
setcolor(cout, r, g, b); |
629 |
> |
colortrans(cout, solmat, cin); |
630 |
> |
return(clipgamut(cout, bright(cout), CGAMUT, colmin, colmax)); |
631 |
|
} |
632 |
|
|
633 |
|
|
642 |
|
ctmp[0] = xyYin[0] * d; |
643 |
|
ctmp[1] = xyYin[2]; |
644 |
|
ctmp[2] = (1. - xyYin[0] - xyYin[1]) * d; |
645 |
< |
cie_rgb(rgbout, ctmp); |
645 |
> |
/* allow negative values */ |
646 |
> |
colortrans(rgbout, xyz2rgbmat, ctmp); |
647 |
|
} |
648 |
|
|
649 |
|
|
651 |
|
{ |
652 |
|
static COLOR blkcol = BLKCOLOR; |
653 |
|
COLOR *scan; |
654 |
< |
int y; |
655 |
< |
register int x, i; |
654 |
> |
int y, i; |
655 |
> |
register int x, rg; |
656 |
|
|
657 |
|
if (fseek(stdin, 0L, 0) == EOF) { |
658 |
|
fprintf(stderr, "%s: cannot seek on input picture\n", progname); |
678 |
|
exit(1); |
679 |
|
} |
680 |
|
for (x = 0; x < xmax; x++) { |
681 |
< |
i = chartndx(x, y, CENTCVG); |
682 |
< |
if (i < 0) |
681 |
> |
rg = chartndx(x, y, &i); |
682 |
> |
if (rg == RG_CENT) { |
683 |
> |
if (!(1L<<i & gmtflags) || (x+y)&07) { |
684 |
> |
copycolor(scan[x], mbRGB[i]); |
685 |
> |
clipgamut(scan[x], bright(scan[x]), |
686 |
> |
CGAMUT, colmin, colmax); |
687 |
> |
} else |
688 |
> |
copycolor(scan[x], blkcol); |
689 |
> |
} else if (rg == RG_CORR) |
690 |
|
cvtcolor(scan[x], scan[x]); |
691 |
< |
else if (!(1L<<i & gmtflags) || (x+y)&07) |
601 |
< |
copycolor(scan[x], mbRGB[i]); |
602 |
< |
else |
691 |
> |
else if (rg != RG_ORIG) |
692 |
|
copycolor(scan[x], blkcol); |
693 |
|
} |
694 |
|
if (fwritescan(scan, xmax, debugfp) < 0) { |
706 |
|
clrdebug() /* put out debug picture from color input */ |
707 |
|
{ |
708 |
|
static COLR blkclr = BLKCOLR; |
709 |
< |
COLR mbclr[24], cvclr[24]; |
709 |
> |
COLR mbclr[24], cvclr[24], orclr[24]; |
710 |
|
COLR *scan; |
711 |
< |
COLOR ctmp; |
712 |
< |
int y; |
713 |
< |
register int i, x; |
711 |
> |
COLOR ctmp, ct2; |
712 |
> |
int y, i; |
713 |
> |
register int x, rg; |
714 |
|
/* convert colors */ |
715 |
|
for (i = 0; i < 24; i++) { |
716 |
< |
setcolr(mbclr[i], colval(mbRGB[i],RED), |
717 |
< |
colval(mbRGB[i],GRN), colval(mbRGB[i],BLU)); |
716 |
> |
copycolor(ctmp, mbRGB[i]); |
717 |
> |
clipgamut(ctmp, bright(ctmp), CGAMUT, cblack, cwhite); |
718 |
> |
setcolr(mbclr[i], colval(ctmp,RED), |
719 |
> |
colval(ctmp,GRN), colval(ctmp,BLU)); |
720 |
|
if (inpflags & 1L<<i) { |
721 |
< |
cvtcolor(ctmp, inpRGB[i]); |
722 |
< |
setcolr(cvclr[i], colval(ctmp,RED), |
721 |
> |
copycolor(ctmp, inpRGB[i]); |
722 |
> |
clipgamut(ctmp, bright(ctmp), CGAMUT, cblack, cwhite); |
723 |
> |
setcolr(orclr[i], colval(ctmp,RED), |
724 |
|
colval(ctmp,GRN), colval(ctmp,BLU)); |
725 |
+ |
if (rawmap) |
726 |
+ |
copycolr(cvclr[i], mbclr[i]); |
727 |
+ |
else { |
728 |
+ |
bresp(ctmp, inpRGB[i]); |
729 |
+ |
colortrans(ct2, solmat, ctmp); |
730 |
+ |
clipgamut(ct2, bright(ct2), CGAMUT, |
731 |
+ |
cblack, cwhite); |
732 |
+ |
setcolr(cvclr[i], colval(ct2,RED), |
733 |
+ |
colval(ct2,GRN), |
734 |
+ |
colval(ct2,BLU)); |
735 |
+ |
} |
736 |
|
} |
737 |
|
} |
738 |
|
/* allocate scanline */ |
747 |
|
fprtresolu(xmax, ymax, debugfp); |
748 |
|
/* write debug picture */ |
749 |
|
for (y = ymax-1; y >= 0; y--) { |
750 |
< |
for (x = 0; x < xmax; x++) |
751 |
< |
if ((i = chartndx(x, y, CENTCVG)) >= 0) { |
750 |
> |
for (x = 0; x < xmax; x++) { |
751 |
> |
rg = chartndx(x, y, &i); |
752 |
> |
if (rg == RG_CENT) { |
753 |
|
if (!(1L<<i & gmtflags) || (x+y)&07) |
754 |
|
copycolr(scan[x], mbclr[i]); |
755 |
|
else |
756 |
|
copycolr(scan[x], blkclr); |
757 |
< |
} else if ((i = chartndx(x, y, FULLCVG)) >= 0 && |
654 |
< |
inpflags & 1L<<i) |
655 |
< |
copycolr(scan[x], cvclr[i]); |
656 |
< |
else |
757 |
> |
} else if (rg == RG_BORD || !(1L<<i & inpflags)) |
758 |
|
copycolr(scan[x], blkclr); |
759 |
+ |
else if (rg == RG_ORIG) |
760 |
+ |
copycolr(scan[x], orclr[i]); |
761 |
+ |
else /* rg == RG_CORR */ |
762 |
+ |
copycolr(scan[x], cvclr[i]); |
763 |
+ |
} |
764 |
|
if (fwritecolrs(scan, xmax, debugfp) < 0) { |
765 |
|
fprintf(stderr, "%s: error writing debugging picture\n", |
766 |
|
progname); |