| 1 |
– |
/* Copyright (c) 1995 Regents of the University of California */ |
| 2 |
– |
|
| 1 |
|
#ifndef lint |
| 2 |
< |
static char SCCSid[] = "$SunId$ LBL"; |
| 2 |
> |
static const char RCSid[] = "$Id$"; |
| 3 |
|
#endif |
| 6 |
– |
|
| 4 |
|
/* |
| 5 |
|
* Calibrate a scanned MacBeth Color Checker Chart |
| 6 |
|
* |
| 7 |
< |
* Produce a .cal file suitable for use with pcomb. |
| 7 |
> |
* Produce a .cal file suitable for use with pcomb, |
| 8 |
> |
* or .cwp file suitable for use with pcwarp. |
| 9 |
> |
* |
| 10 |
> |
* Warping code depends on conformance of COLOR and W3VEC types. |
| 11 |
|
*/ |
| 12 |
|
|
| 13 |
< |
#include <stdio.h> |
| 14 |
< |
#ifdef MSDOS |
| 15 |
< |
#include <fcntl.h> |
| 16 |
< |
#endif |
| 13 |
> |
#include <math.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 */ |
| 80 |
|
#define NMBNEU 6 /* Number of MacBeth neutral colors */ |
| 81 |
|
short mbneu[NMBNEU] = {Black,Neutral35,Neutral5,Neutral65,Neutral8,White}; |
| 82 |
|
|
| 83 |
< |
#define NMBMOD 16 /* Number of MacBeth unsaturated colors */ |
| 84 |
< |
short mbmod[NMBMOD] = { |
| 82 |
< |
DarkSkin,LightSkin,BlueSky,Foliage,BlueFlower,BluishGreen, |
| 83 |
< |
PurplishBlue,ModerateRed,YellowGreen,OrangeYellow, |
| 84 |
< |
Black,Neutral35,Neutral5,Neutral65,Neutral8,White |
| 85 |
< |
}; |
| 83 |
> |
#define NEUFLGS (1L<<White|1L<<Neutral8|1L<<Neutral65| \ |
| 84 |
> |
1L<<Neutral5|1L<<Neutral35|1L<<Black) |
| 85 |
|
|
| 86 |
< |
#define NMBSAT 8 /* Number of MacBeth saturated colors */ |
| 87 |
< |
short mbsat[NMBSAT] = { |
| 88 |
< |
Red,Green,Blue,Magenta,Yellow,Cyan, |
| 90 |
< |
Orange,Purple |
| 91 |
< |
}; |
| 86 |
> |
#define SATFLGS (1L<<Red|1L<<Green|1L<<Blue|1L<<Magenta|1L<<Yellow| \ |
| 87 |
> |
1L<<Cyan|1L<<Orange|1L<<Purple|1L<<PurplishBlue| \ |
| 88 |
> |
1L<<YellowGreen|1<<OrangeYellow|1L<<BlueFlower) |
| 89 |
|
|
| 90 |
< |
#define REQFLGS (1L<<White|1L<<Neutral8|1L<<Neutral65| \ |
| 91 |
< |
1L<<Neutral5|1L<<Neutral35|1L<<Black) |
| 90 |
> |
#define UNSFLGS (1L<<DarkSkin|1L<<LightSkin|1L<<BlueSky|1L<<Foliage| \ |
| 91 |
> |
1L<<BluishGreen|1L<<ModerateRed) |
| 92 |
|
|
| 93 |
< |
#define CENTCVG 0.3 /* measured coverage of square sample */ |
| 94 |
< |
#define FULLCVG 0.9 /* coverage of entire square */ |
| 93 |
> |
#define REQFLGS NEUFLGS /* need these colors */ |
| 94 |
> |
#define MODFLGS (NEUFLGS|UNSFLGS) /* should be in gamut */ |
| 95 |
|
|
| 96 |
+ |
#define RG_BORD 0 /* patch border */ |
| 97 |
+ |
#define RG_CENT 01 /* central region of patch */ |
| 98 |
+ |
#define RG_ORIG 02 /* original color region */ |
| 99 |
+ |
#define RG_CORR 04 /* corrected color region */ |
| 100 |
+ |
|
| 101 |
+ |
#ifndef DISPCOM |
| 102 |
+ |
#define DISPCOM "ximage -e auto -op \"%s\"" |
| 103 |
+ |
#endif |
| 104 |
+ |
|
| 105 |
+ |
int scanning = 1; /* scanned input (or recorded output)? */ |
| 106 |
+ |
double irrad = 1.0; /* irradiance multiplication factor */ |
| 107 |
+ |
int rawmap = 0; /* put out raw color mapping? */ |
| 108 |
+ |
|
| 109 |
|
int xmax, ymax; /* input image dimensions */ |
| 110 |
|
int bounds[4][2]; /* image coordinates of chart corners */ |
| 111 |
|
double imgxfm[3][3]; /* coordinate transformation matrix */ |
| 112 |
|
|
| 113 |
|
COLOR inpRGB[24]; /* measured or scanned input colors */ |
| 114 |
|
long inpflags = 0; /* flags of which colors were input */ |
| 115 |
+ |
long gmtflags = 0; /* flags of out-of-gamut colors */ |
| 116 |
|
|
| 117 |
|
COLOR bramp[NMBNEU][2]; /* brightness ramp (per primary) */ |
| 118 |
< |
double solmat[3][3]; /* color mapping matrix */ |
| 118 |
> |
COLORMAT solmat; /* color mapping matrix */ |
| 119 |
> |
COLOR colmin, colmax; /* gamut limits */ |
| 120 |
|
|
| 121 |
+ |
WARP3D *wcor = NULL; /* color space warp */ |
| 122 |
+ |
|
| 123 |
|
FILE *debugfp = NULL; /* debug output picture */ |
| 124 |
|
char *progname; |
| 125 |
|
|
| 126 |
< |
extern char *malloc(); |
| 126 |
> |
static void init(void); |
| 127 |
> |
static int chartndx(int x, int y, int *np); |
| 128 |
> |
static void getpicture(void); |
| 129 |
> |
static void getcolors(void); |
| 130 |
> |
static void bresp(COLOR y, COLOR x); |
| 131 |
> |
static void ibresp(COLOR y, COLOR x); |
| 132 |
> |
static void compute(void); |
| 133 |
> |
static void putmapping(void); |
| 134 |
> |
static void compsoln(COLOR cin[], COLOR cout[], int n); |
| 135 |
> |
static void cwarp(void); |
| 136 |
> |
static int cvtcolor(COLOR cout, COLOR cin); |
| 137 |
> |
static int cresp(COLOR cout, COLOR cin); |
| 138 |
> |
static void xyY2RGB(COLOR rgbout, float xyYin[3]); |
| 139 |
> |
static void picdebug(void); |
| 140 |
> |
static void clrdebug(void); |
| 141 |
> |
static void getpos(char *name, int bnds[2], FILE *fp); |
| 142 |
> |
static void pickchartpos(char *pfn); |
| 143 |
|
|
| 144 |
|
|
| 145 |
< |
main(argc, argv) |
| 146 |
< |
int argc; |
| 147 |
< |
char **argv; |
| 145 |
> |
int |
| 146 |
> |
main( |
| 147 |
> |
int argc, |
| 148 |
> |
char **argv |
| 149 |
> |
) |
| 150 |
|
{ |
| 119 |
– |
int inpispic = 1; |
| 151 |
|
int i; |
| 152 |
|
|
| 153 |
|
progname = argv[0]; |
| 161 |
|
perror(argv[i]); |
| 162 |
|
exit(1); |
| 163 |
|
} |
| 164 |
< |
#ifdef MSDOS |
| 134 |
< |
setmode(fileno(debugfp), O_BINARY); |
| 135 |
< |
#endif |
| 164 |
> |
SET_FILE_BINARY(debugfp); |
| 165 |
|
newheader("RADIANCE", debugfp); /* start */ |
| 166 |
|
printargs(argc, argv, debugfp); /* header */ |
| 167 |
|
break; |
| 176 |
|
bounds[2][1] = atoi(argv[++i]); |
| 177 |
|
bounds[3][0] = atoi(argv[++i]); |
| 178 |
|
bounds[3][1] = atoi(argv[++i]); |
| 179 |
< |
inpispic = 2; |
| 179 |
> |
scanning = 2; |
| 180 |
|
break; |
| 181 |
+ |
case 'P': /* pick position */ |
| 182 |
+ |
scanning = 3; |
| 183 |
+ |
break; |
| 184 |
+ |
case 'i': /* irradiance factor */ |
| 185 |
+ |
i++; |
| 186 |
+ |
if (badarg(argc-i, argv+i, "f")) |
| 187 |
+ |
goto userr; |
| 188 |
+ |
irrad = atof(argv[i]); |
| 189 |
+ |
break; |
| 190 |
+ |
case 'm': /* raw map output */ |
| 191 |
+ |
rawmap = 1; |
| 192 |
+ |
break; |
| 193 |
|
case 'c': /* color input */ |
| 194 |
< |
inpispic = 0; |
| 194 |
> |
scanning = 0; |
| 195 |
|
break; |
| 196 |
|
default: |
| 197 |
|
goto userr; |
| 198 |
|
} |
| 199 |
|
/* open files */ |
| 200 |
|
if (i < argc && freopen(argv[i], "r", stdin) == NULL) { |
| 201 |
< |
perror(argv[1]); |
| 201 |
> |
perror(argv[i]); |
| 202 |
|
exit(1); |
| 203 |
|
} |
| 204 |
|
if (i+1 < argc && freopen(argv[i+1], "w", stdout) == NULL) { |
| 205 |
< |
perror(argv[2]); |
| 205 |
> |
perror(argv[i+1]); |
| 206 |
|
exit(1); |
| 207 |
|
} |
| 208 |
< |
if (inpispic) { /* load input picture header */ |
| 209 |
< |
#ifdef MSDOS |
| 169 |
< |
setmode(fileno(stdin), O_BINARY); |
| 170 |
< |
#endif |
| 208 |
> |
if (scanning) { /* load input picture header */ |
| 209 |
> |
SET_FILE_BINARY(stdin); |
| 210 |
|
if (checkheader(stdin, COLRFMT, NULL) < 0 || |
| 211 |
|
fgetresolu(&xmax, &ymax, stdin) < 0) { |
| 212 |
|
fprintf(stderr, "%s: bad input picture\n", progname); |
| 213 |
|
exit(1); |
| 214 |
|
} |
| 215 |
+ |
if (scanning == 3) { |
| 216 |
+ |
if (i >= argc) |
| 217 |
+ |
goto userr; |
| 218 |
+ |
pickchartpos(argv[i]); |
| 219 |
+ |
scanning = 2; |
| 220 |
+ |
} |
| 221 |
|
} else { /* else set default xmax and ymax */ |
| 222 |
|
xmax = 512; |
| 223 |
|
ymax = 2*512/3; |
| 224 |
|
} |
| 225 |
< |
if (inpispic != 2) { /* use default boundaries */ |
| 225 |
> |
if (scanning != 2) { /* use default boundaries */ |
| 226 |
|
bounds[0][0] = bounds[2][0] = .029*xmax + .5; |
| 227 |
|
bounds[0][1] = bounds[1][1] = .956*ymax + .5; |
| 228 |
|
bounds[1][0] = bounds[3][0] = .971*xmax + .5; |
| 229 |
|
bounds[2][1] = bounds[3][1] = .056*ymax + .5; |
| 230 |
|
} |
| 231 |
|
init(); /* initialize */ |
| 232 |
< |
if (inpispic) /* get picture colors */ |
| 232 |
> |
if (scanning) /* get picture colors */ |
| 233 |
|
getpicture(); |
| 234 |
|
else |
| 235 |
|
getcolors(); |
| 236 |
|
compute(); /* compute color mapping */ |
| 237 |
< |
/* print comment */ |
| 238 |
< |
printf("{ Color correction file computed by:\n\t"); |
| 239 |
< |
printargs(argc, argv, stdout); |
| 240 |
< |
printf("}\n"); |
| 241 |
< |
putmapping(); /* put out color mapping */ |
| 242 |
< |
if (debugfp != NULL) /* put out debug picture */ |
| 243 |
< |
if (inpispic) |
| 237 |
> |
if (rawmap) { /* print out raw correspondence */ |
| 238 |
> |
int j; |
| 239 |
> |
|
| 240 |
> |
printf("# Color correspondence produced by:\n#\t\t"); |
| 241 |
> |
printargs(argc, argv, stdout); |
| 242 |
> |
printf("#\tUsage: pcwarp %s uncorrected.hdr > corrected.hdr\n", |
| 243 |
> |
i+1 < argc ? argv[i+1] : "{this_file}"); |
| 244 |
> |
printf("#\t Or: pcond [options] -m %s orig.hdr > output.hdr\n", |
| 245 |
> |
i+1 < argc ? argv[i+1] : "{this_file}"); |
| 246 |
> |
for (j = 0; j < 24; j++) |
| 247 |
> |
printf("%f %f %f %f %f %f\n", |
| 248 |
> |
colval(inpRGB[j],RED), colval(inpRGB[j],GRN), |
| 249 |
> |
colval(inpRGB[j],BLU), colval(mbRGB[j],RED), |
| 250 |
> |
colval(mbRGB[j],GRN), colval(mbRGB[j],BLU)); |
| 251 |
> |
if (scanning && debugfp != NULL) |
| 252 |
> |
cwarp(); /* color warp for debugging */ |
| 253 |
> |
} else { /* print color mapping */ |
| 254 |
> |
/* print header */ |
| 255 |
> |
printf("{\n\tColor correction file computed by:\n\t\t"); |
| 256 |
> |
printargs(argc, argv, stdout); |
| 257 |
> |
printf("\n\tUsage: pcomb -f %s uncorrected.hdr > corrected.hdr\n", |
| 258 |
> |
i+1 < argc ? argv[i+1] : "{this_file}"); |
| 259 |
> |
if (!scanning) |
| 260 |
> |
printf("\t Or: pcond [options] -f %s orig.hdr > output.hdr\n", |
| 261 |
> |
i+1 < argc ? argv[i+1] : "{this_file}"); |
| 262 |
> |
printf("}\n"); |
| 263 |
> |
putmapping(); /* put out color mapping */ |
| 264 |
> |
} |
| 265 |
> |
if (debugfp != NULL) { /* put out debug picture */ |
| 266 |
> |
if (scanning) |
| 267 |
|
picdebug(); |
| 268 |
|
else |
| 269 |
|
clrdebug(); |
| 270 |
+ |
} |
| 271 |
|
exit(0); |
| 272 |
|
userr: |
| 273 |
|
fprintf(stderr, |
| 274 |
< |
"Usage: %s [-d dbg.pic][-p xul yul xur yur xll yll xlr ylr] input.pic [output.cal]\n", |
| 274 |
> |
"Usage: %s [-d dbg.hdr][-P | -p xul yul xur yur xll yll xlr ylr][-i irrad][-m] input.hdr [output.{cal|cwp}]\n", |
| 275 |
|
progname); |
| 276 |
< |
fprintf(stderr, " or: %s [-d dbg.pic] -c [xyY.dat [output.cal]]\n", |
| 276 |
> |
fprintf(stderr, " or: %s [-d dbg.hdr][-i irrad][-m] -c [xyY.dat [output.{cal|cwp}]]\n", |
| 277 |
|
progname); |
| 278 |
|
exit(1); |
| 279 |
+ |
return 1; /* pro forma return */ |
| 280 |
|
} |
| 281 |
|
|
| 282 |
|
|
| 283 |
< |
init() /* initialize */ |
| 283 |
> |
static void |
| 284 |
> |
init(void) /* initialize */ |
| 285 |
|
{ |
| 286 |
|
double quad[4][2]; |
| 287 |
< |
register int i; |
| 287 |
> |
int i; |
| 288 |
|
/* make coordinate transformation */ |
| 289 |
|
quad[0][0] = bounds[0][0]; |
| 290 |
|
quad[0][1] = bounds[0][1]; |
| 300 |
|
exit(1); |
| 301 |
|
} |
| 302 |
|
/* map MacBeth colors to RGB space */ |
| 303 |
< |
for (i = 0; i < 24; i++) |
| 303 |
> |
for (i = 0; i < 24; i++) { |
| 304 |
|
xyY2RGB(mbRGB[i], mbxyY[i]); |
| 305 |
+ |
scalecolor(mbRGB[i], irrad); |
| 306 |
+ |
} |
| 307 |
|
} |
| 308 |
|
|
| 309 |
|
|
| 310 |
< |
int |
| 311 |
< |
chartndx(x, y, cvg) /* find color number for position */ |
| 312 |
< |
int x, y; |
| 313 |
< |
double cvg; |
| 310 |
> |
static int |
| 311 |
> |
chartndx( /* find color number for position */ |
| 312 |
> |
int x, |
| 313 |
> |
int y, |
| 314 |
> |
int *np |
| 315 |
> |
) |
| 316 |
|
{ |
| 317 |
|
double ipos[3], cpos[3]; |
| 318 |
|
int ix, iy; |
| 319 |
|
double fx, fy; |
| 245 |
– |
double cmin, cmax; |
| 320 |
|
|
| 321 |
|
ipos[0] = x; |
| 322 |
|
ipos[1] = y; |
| 324 |
|
mx3d_transform(ipos, imgxfm, cpos); |
| 325 |
|
cpos[0] /= cpos[2]; |
| 326 |
|
cpos[1] /= cpos[2]; |
| 327 |
< |
if (cpos[0] < 0. || cpos[0] >= 6. || cpos[1] < 0. || cpos[1] >= 4.) |
| 328 |
< |
return(-1); |
| 327 |
> |
if ((cpos[0] < 0.) | (cpos[0] >= 6.) | (cpos[1] < 0.) | (cpos[1] >= 4.)) |
| 328 |
> |
return(RG_BORD); |
| 329 |
|
ix = cpos[0]; |
| 330 |
|
iy = cpos[1]; |
| 331 |
|
fx = cpos[0] - ix; |
| 332 |
|
fy = cpos[1] - iy; |
| 333 |
< |
cmin = .5*(1.-cvg); |
| 334 |
< |
cmax = 1. - cmin; |
| 335 |
< |
if (fx < cmin || fx >= cmax || fy < cmin || fy >= cmax) |
| 336 |
< |
return(-1); |
| 337 |
< |
return(iy*6 + ix); |
| 333 |
> |
*np = iy*6 + ix; |
| 334 |
> |
if ((fx >= 0.35) & (fx < 0.65) & (fy >= 0.35) & (fy < 0.65)) |
| 335 |
> |
return(RG_CENT); |
| 336 |
> |
if ((fx < 0.05) | (fx >= 0.95) | (fy < 0.05) | (fy >= 0.95)) |
| 337 |
> |
return(RG_BORD); |
| 338 |
> |
if (fx >= 0.5) /* right side is corrected */ |
| 339 |
> |
return(RG_CORR); |
| 340 |
> |
return(RG_ORIG); /* left side is original */ |
| 341 |
|
} |
| 342 |
|
|
| 343 |
|
|
| 344 |
< |
getpicture() /* load in picture colors */ |
| 344 |
> |
static void |
| 345 |
> |
getpicture(void) /* load in picture colors */ |
| 346 |
|
{ |
| 347 |
|
COLR *scanln; |
| 348 |
|
COLOR pval; |
| 349 |
|
int ccount[24]; |
| 350 |
|
double d; |
| 351 |
< |
int y; |
| 352 |
< |
register int x, i; |
| 351 |
> |
int y, i; |
| 352 |
> |
int x; |
| 353 |
|
|
| 354 |
|
scanln = (COLR *)malloc(xmax*sizeof(COLR)); |
| 355 |
|
if (scanln == NULL) { |
| 366 |
|
progname); |
| 367 |
|
exit(1); |
| 368 |
|
} |
| 369 |
< |
for (x = 0; x < xmax; x++) { |
| 370 |
< |
i = chartndx(x, y, CENTCVG); |
| 293 |
< |
if (i >= 0) { |
| 369 |
> |
for (x = 0; x < xmax; x++) |
| 370 |
> |
if (chartndx(x, y, &i) == RG_CENT) { |
| 371 |
|
colr_color(pval, scanln[x]); |
| 372 |
|
addcolor(inpRGB[i], pval); |
| 373 |
|
ccount[i]++; |
| 374 |
|
} |
| 298 |
– |
} |
| 375 |
|
} |
| 376 |
|
for (i = 0; i < 24; i++) { /* compute averages */ |
| 377 |
|
if (ccount[i] == 0) |
| 380 |
|
scalecolor(inpRGB[i], d); |
| 381 |
|
inpflags |= 1L<<i; |
| 382 |
|
} |
| 383 |
< |
free((char *)scanln); |
| 383 |
> |
free((void *)scanln); |
| 384 |
|
} |
| 385 |
|
|
| 386 |
|
|
| 387 |
< |
getcolors() /* get xyY colors from standard input */ |
| 387 |
> |
static void |
| 388 |
> |
getcolors(void) /* get xyY colors from standard input */ |
| 389 |
|
{ |
| 390 |
|
int gotwhite = 0; |
| 391 |
|
COLOR whiteclr; |
| 393 |
|
float xyYin[3]; |
| 394 |
|
|
| 395 |
|
while (fgetval(stdin, 'i', &n) == 1) { /* read colors */ |
| 396 |
< |
if (n < 0 | n > 24 || |
| 396 |
> |
if ((n < 0) | (n > 24) || |
| 397 |
|
fgetval(stdin, 'f', &xyYin[0]) != 1 || |
| 398 |
|
fgetval(stdin, 'f', &xyYin[1]) != 1 || |
| 399 |
|
fgetval(stdin, 'f', &xyYin[2]) != 1 || |
| 400 |
< |
xyYin[0] < 0. | xyYin[0] > 1. | |
| 401 |
< |
xyYin[1] < 0. | xyYin[1] > 1.) { |
| 400 |
> |
(xyYin[0] < 0.) | (xyYin[1] < 0.) || |
| 401 |
> |
xyYin[0] + xyYin[1] > 1.) { |
| 402 |
|
fprintf(stderr, "%s: bad color input data\n", |
| 403 |
|
progname); |
| 404 |
|
exit(1); |
| 433 |
|
} |
| 434 |
|
|
| 435 |
|
|
| 436 |
< |
bresp(y, x) /* piecewise linear interpolation of primaries */ |
| 437 |
< |
COLOR y, x; |
| 436 |
> |
static void |
| 437 |
> |
bresp( /* piecewise linear interpolation of primaries */ |
| 438 |
> |
COLOR y, /* y is linear output */ |
| 439 |
> |
COLOR x /* x is non-linear input */ |
| 440 |
> |
) |
| 441 |
|
{ |
| 442 |
< |
double cv[3]; |
| 363 |
< |
register int i, n; |
| 442 |
> |
int i, n; |
| 443 |
|
|
| 444 |
|
for (i = 0; i < 3; i++) { |
| 445 |
|
for (n = 0; n < NMBNEU-2; n++) |
| 446 |
|
if (colval(x,i) < colval(bramp[n+1][0],i)) |
| 447 |
|
break; |
| 448 |
< |
cv[i] = ((colval(bramp[n+1][0],i) - colval(x,i)) * |
| 448 |
> |
colval(y,i) = ((colval(bramp[n+1][0],i) - colval(x,i)) * |
| 449 |
|
colval(bramp[n][1],i) + |
| 450 |
|
(colval(x,i) - colval(bramp[n][0],i)) * |
| 451 |
|
colval(bramp[n+1][1],i)) / |
| 452 |
|
(colval(bramp[n+1][0],i) - colval(bramp[n][0],i)); |
| 374 |
– |
if (cv[i] < 0.) cv[i] = 0.; |
| 453 |
|
} |
| 376 |
– |
setcolor(y, cv[0], cv[1], cv[2]); |
| 454 |
|
} |
| 455 |
|
|
| 456 |
|
|
| 457 |
< |
compute() /* compute color mapping */ |
| 457 |
> |
static void |
| 458 |
> |
ibresp( /* inverse mapping (delinearization) */ |
| 459 |
> |
COLOR x, /* x is non-linear output */ |
| 460 |
> |
COLOR y /* y is linear input */ |
| 461 |
> |
) |
| 462 |
|
{ |
| 463 |
< |
COLOR clrin[NMBMOD], clrout[NMBMOD]; |
| 464 |
< |
register int i, n; |
| 463 |
> |
int i, n; |
| 464 |
> |
|
| 465 |
> |
for (i = 0; i < 3; i++) { |
| 466 |
> |
for (n = 0; n < NMBNEU-2; n++) |
| 467 |
> |
if (colval(y,i) < colval(bramp[n+1][1],i)) |
| 468 |
> |
break; |
| 469 |
> |
colval(x,i) = ((colval(bramp[n+1][1],i) - colval(y,i)) * |
| 470 |
> |
colval(bramp[n][0],i) + |
| 471 |
> |
(colval(y,i) - colval(bramp[n][1],i)) * |
| 472 |
> |
colval(bramp[n+1][0],i)) / |
| 473 |
> |
(colval(bramp[n+1][1],i) - colval(bramp[n][1],i)); |
| 474 |
> |
} |
| 475 |
> |
} |
| 476 |
> |
|
| 477 |
> |
|
| 478 |
> |
static void |
| 479 |
> |
compute(void) /* compute color mapping */ |
| 480 |
> |
{ |
| 481 |
> |
COLOR clrin[24], clrout[24]; |
| 482 |
> |
long cflags; |
| 483 |
> |
COLOR ctmp; |
| 484 |
> |
int i, n; |
| 485 |
|
/* did we get what we need? */ |
| 486 |
|
if ((inpflags & REQFLGS) != REQFLGS) { |
| 487 |
|
fprintf(stderr, "%s: missing required input colors\n", |
| 491 |
|
/* compute piecewise luminance curve */ |
| 492 |
|
for (i = 0; i < NMBNEU; i++) { |
| 493 |
|
copycolor(bramp[i][0], inpRGB[mbneu[i]]); |
| 494 |
+ |
for (n = 3*(i>0); n--; ) |
| 495 |
+ |
if (colval(bramp[i][0],n) <= |
| 496 |
+ |
colval(bramp[i-1][0],n)+1e-7) { |
| 497 |
+ |
fprintf(stderr, |
| 498 |
+ |
"%s: non-increasing neutral patch\n", progname); |
| 499 |
+ |
exit(1); |
| 500 |
+ |
} |
| 501 |
|
copycolor(bramp[i][1], mbRGB[mbneu[i]]); |
| 502 |
|
} |
| 503 |
< |
/* compute color matrix */ |
| 504 |
< |
for (n = 0, i = 0; i < NMBMOD; i++) |
| 505 |
< |
if (inpflags & 1L<<mbmod[i]) { |
| 506 |
< |
bresp(clrin[n], inpRGB[mbmod[i]]); |
| 507 |
< |
copycolor(clrout[n], mbRGB[mbmod[i]]); |
| 503 |
> |
/* compute color space gamut */ |
| 504 |
> |
copycolor(colmin, cblack); |
| 505 |
> |
copycolor(colmax, cwhite); |
| 506 |
> |
scalecolor(colmax, irrad); |
| 507 |
> |
if (!scanning) { |
| 508 |
> |
ibresp(colmin, colmin); |
| 509 |
> |
ibresp(colmax, colmax); |
| 510 |
> |
} |
| 511 |
> |
/* compute color mapping */ |
| 512 |
> |
do { |
| 513 |
> |
cflags = inpflags & ~gmtflags; |
| 514 |
> |
n = 0; /* compute transform matrix */ |
| 515 |
> |
for (i = 0; i < 24; i++) { |
| 516 |
> |
if (!(cflags & 1L<<i)) |
| 517 |
> |
continue; |
| 518 |
> |
if (scanning) { |
| 519 |
> |
bresp(clrin[n], inpRGB[i]); |
| 520 |
> |
copycolor(clrout[n], mbRGB[i]); |
| 521 |
> |
} else { |
| 522 |
> |
copycolor(clrin[n], inpRGB[i]); |
| 523 |
> |
ibresp(clrout[n], mbRGB[i]); |
| 524 |
> |
} |
| 525 |
|
n++; |
| 526 |
|
} |
| 527 |
< |
compsoln(clrin, clrout, n); |
| 527 |
> |
compsoln(clrin, clrout, n); |
| 528 |
> |
for (i = 0; i < 24; i++) /* check gamut */ |
| 529 |
> |
if (cflags & 1L<<i && cvtcolor(ctmp, inpRGB[i])) |
| 530 |
> |
gmtflags |= 1L<<i; |
| 531 |
> |
} while (cflags & gmtflags); |
| 532 |
> |
|
| 533 |
> |
if (gmtflags & MODFLGS) |
| 534 |
> |
fprintf(stderr, |
| 535 |
> |
"%s: warning - some moderate colors are out of gamut\n", |
| 536 |
> |
progname); |
| 537 |
|
} |
| 538 |
|
|
| 539 |
|
|
| 540 |
< |
putmapping() /* put out color mapping for pcomb -f */ |
| 540 |
> |
static void |
| 541 |
> |
putmapping(void) /* put out color mapping */ |
| 542 |
|
{ |
| 543 |
|
static char cchar[3] = {'r', 'g', 'b'}; |
| 544 |
< |
register int i, j; |
| 544 |
> |
int i, j; |
| 545 |
|
/* print brightness mapping */ |
| 546 |
|
for (j = 0; j < 3; j++) { |
| 547 |
|
printf("%cxa(i) : select(i", cchar[j]); |
| 552 |
|
for (i = 0; i < NMBNEU; i++) |
| 553 |
|
printf(",%g", colval(bramp[i][1],j)); |
| 554 |
|
printf(");\n"); |
| 420 |
– |
printf("%c = %ci(1);\n", cchar[j], cchar[j]); |
| 555 |
|
printf("%cfi(n) = if(n-%g, %d, if(%cxa(n+1)-%c, n, %cfi(n+1)));\n", |
| 556 |
|
cchar[j], NMBNEU-1.5, NMBNEU-1, cchar[j], |
| 557 |
|
cchar[j], cchar[j]); |
| 558 |
|
printf("%cndx = %cfi(1);\n", cchar[j], cchar[j]); |
| 559 |
< |
printf("%cn = ((%cxa(%cndx+1)-%c)*%cya(%cndx) + ", |
| 560 |
< |
cchar[j], cchar[j], cchar[j], |
| 561 |
< |
cchar[j], cchar[j], cchar[j]); |
| 559 |
> |
printf("%c%c = ((%cxa(%cndx+1)-%c)*%cya(%cndx) + ", |
| 560 |
> |
cchar[j], scanning?'n':'o', cchar[j], |
| 561 |
> |
cchar[j], cchar[j], cchar[j], cchar[j]); |
| 562 |
|
printf("(%c-%cxa(%cndx))*%cya(%cndx+1)) /\n", |
| 563 |
|
cchar[j], cchar[j], cchar[j], |
| 564 |
|
cchar[j], cchar[j]); |
| 566 |
|
cchar[j], cchar[j], cchar[j], cchar[j]); |
| 567 |
|
} |
| 568 |
|
/* print color mapping */ |
| 569 |
< |
printf("ro = %g*rn + %g*gn + %g*bn ;\n", |
| 570 |
< |
solmat[0][0], solmat[0][1], solmat[0][2]); |
| 571 |
< |
printf("go = %g*rn + %g*gn + %g*bn ;\n", |
| 572 |
< |
solmat[1][0], solmat[1][1], solmat[1][2]); |
| 573 |
< |
printf("bo = %g*rn + %g*gn + %g*bn ;\n", |
| 574 |
< |
solmat[2][0], solmat[2][1], solmat[2][2]); |
| 569 |
> |
if (scanning) { |
| 570 |
> |
printf("r = ri(1); g = gi(1); b = bi(1);\n"); |
| 571 |
> |
printf("ro = %g*rn + %g*gn + %g*bn ;\n", |
| 572 |
> |
solmat[0][0], solmat[0][1], solmat[0][2]); |
| 573 |
> |
printf("go = %g*rn + %g*gn + %g*bn ;\n", |
| 574 |
> |
solmat[1][0], solmat[1][1], solmat[1][2]); |
| 575 |
> |
printf("bo = %g*rn + %g*gn + %g*bn ;\n", |
| 576 |
> |
solmat[2][0], solmat[2][1], solmat[2][2]); |
| 577 |
> |
} else { |
| 578 |
> |
printf("r1 = ri(1); g1 = gi(1); b1 = bi(1);\n"); |
| 579 |
> |
printf("r = %g*r1 + %g*g1 + %g*b1 ;\n", |
| 580 |
> |
solmat[0][0], solmat[0][1], solmat[0][2]); |
| 581 |
> |
printf("g = %g*r1 + %g*g1 + %g*b1 ;\n", |
| 582 |
> |
solmat[1][0], solmat[1][1], solmat[1][2]); |
| 583 |
> |
printf("b = %g*r1 + %g*g1 + %g*b1 ;\n", |
| 584 |
> |
solmat[2][0], solmat[2][1], solmat[2][2]); |
| 585 |
> |
} |
| 586 |
|
} |
| 587 |
|
|
| 588 |
|
|
| 589 |
< |
compsoln(cin, cout, n) /* solve 3xN system using least-squares */ |
| 590 |
< |
COLOR cin[], cout[]; |
| 591 |
< |
int n; |
| 589 |
> |
static void |
| 590 |
> |
compsoln( /* solve 3xN system using least-squares */ |
| 591 |
> |
COLOR cin[], |
| 592 |
> |
COLOR cout[], |
| 593 |
> |
int n |
| 594 |
> |
) |
| 595 |
|
{ |
| 596 |
|
extern double mx3d_adjoint(), fabs(); |
| 597 |
|
double mat[3][3], invmat[3][3]; |
| 598 |
|
double det; |
| 599 |
|
double colv[3], rowv[3]; |
| 600 |
< |
register int i, j, k; |
| 600 |
> |
int i, j, k; |
| 601 |
|
|
| 602 |
< |
if (n < 3 | n > NMBMOD) { |
| 603 |
< |
fprintf(stderr, "%s: bad number of colors to match\n", progname); |
| 602 |
> |
if (n < 3) { |
| 603 |
> |
fprintf(stderr, "%s: too few colors to match!\n", progname); |
| 604 |
|
exit(1); |
| 605 |
|
} |
| 606 |
|
if (n == 3) |
| 649 |
|
} |
| 650 |
|
|
| 651 |
|
|
| 652 |
< |
cvtcolor(cout, cin) /* convert color according to our mapping */ |
| 653 |
< |
COLOR cout, cin; |
| 652 |
> |
static void |
| 653 |
> |
cwarp(void) /* compute color warp map */ |
| 654 |
|
{ |
| 655 |
< |
double r, g, b; |
| 655 |
> |
int i; |
| 656 |
|
|
| 657 |
< |
bresp(cout, cin); |
| 658 |
< |
r = colval(cout,0)*solmat[0][0] + colval(cout,1)*solmat[0][1] |
| 659 |
< |
+ colval(cout,2)*solmat[0][2]; |
| 660 |
< |
if (r < 0) r = 0; |
| 661 |
< |
g = colval(cout,0)*solmat[1][0] + colval(cout,1)*solmat[1][1] |
| 662 |
< |
+ colval(cout,2)*solmat[1][2]; |
| 663 |
< |
if (g < 0) g = 0; |
| 664 |
< |
b = colval(cout,0)*solmat[2][0] + colval(cout,1)*solmat[2][1] |
| 665 |
< |
+ colval(cout,2)*solmat[2][2]; |
| 518 |
< |
if (b < 0) b = 0; |
| 519 |
< |
setcolor(cout, r, g, b); |
| 657 |
> |
if ((wcor = new3dw(W3EXACT)) == NULL) |
| 658 |
> |
goto memerr; |
| 659 |
> |
for (i = 0; i < 24; i++) |
| 660 |
> |
if (!add3dpt(wcor, inpRGB[i], mbRGB[i])) |
| 661 |
> |
goto memerr; |
| 662 |
> |
return; |
| 663 |
> |
memerr: |
| 664 |
> |
perror(progname); |
| 665 |
> |
exit(1); |
| 666 |
|
} |
| 667 |
|
|
| 668 |
|
|
| 669 |
< |
xyY2RGB(rgbout, xyYin) /* convert xyY to RGB */ |
| 670 |
< |
COLOR rgbout; |
| 671 |
< |
register float xyYin[3]; |
| 669 |
> |
static int |
| 670 |
> |
cvtcolor( /* convert color according to our mapping */ |
| 671 |
> |
COLOR cout, |
| 672 |
> |
COLOR cin |
| 673 |
> |
) |
| 674 |
|
{ |
| 675 |
|
COLOR ctmp; |
| 676 |
+ |
int clipped; |
| 677 |
+ |
|
| 678 |
+ |
if (wcor != NULL) { |
| 679 |
+ |
clipped = warp3d(cout, cin, wcor); |
| 680 |
+ |
clipped |= clipgamut(cout,bright(cout),CGAMUT,colmin,colmax); |
| 681 |
+ |
} else if (scanning) { |
| 682 |
+ |
bresp(ctmp, cin); |
| 683 |
+ |
clipped = cresp(cout, ctmp); |
| 684 |
+ |
} else { |
| 685 |
+ |
clipped = cresp(ctmp, cin); |
| 686 |
+ |
bresp(cout, ctmp); |
| 687 |
+ |
} |
| 688 |
+ |
return(clipped); |
| 689 |
+ |
} |
| 690 |
+ |
|
| 691 |
+ |
|
| 692 |
+ |
static int |
| 693 |
+ |
cresp( /* transform color according to matrix */ |
| 694 |
+ |
COLOR cout, |
| 695 |
+ |
COLOR cin |
| 696 |
+ |
) |
| 697 |
+ |
{ |
| 698 |
+ |
colortrans(cout, solmat, cin); |
| 699 |
+ |
return(clipgamut(cout, bright(cout), CGAMUT, colmin, colmax)); |
| 700 |
+ |
} |
| 701 |
+ |
|
| 702 |
+ |
|
| 703 |
+ |
static void |
| 704 |
+ |
xyY2RGB( /* convert xyY to RGB */ |
| 705 |
+ |
COLOR rgbout, |
| 706 |
+ |
float xyYin[3] |
| 707 |
+ |
) |
| 708 |
+ |
{ |
| 709 |
+ |
COLOR ctmp; |
| 710 |
|
double d; |
| 711 |
|
|
| 712 |
|
d = xyYin[2] / xyYin[1]; |
| 713 |
|
ctmp[0] = xyYin[0] * d; |
| 714 |
|
ctmp[1] = xyYin[2]; |
| 715 |
|
ctmp[2] = (1. - xyYin[0] - xyYin[1]) * d; |
| 716 |
< |
cie_rgb(rgbout, ctmp); |
| 716 |
> |
/* allow negative values */ |
| 717 |
> |
colortrans(rgbout, xyz2rgbmat, ctmp); |
| 718 |
|
} |
| 719 |
|
|
| 720 |
|
|
| 721 |
< |
picdebug() /* put out debugging picture */ |
| 721 |
> |
static void |
| 722 |
> |
picdebug(void) /* put out debugging picture */ |
| 723 |
|
{ |
| 724 |
+ |
static COLOR blkcol = BLKCOLOR; |
| 725 |
|
COLOR *scan; |
| 726 |
< |
int y; |
| 727 |
< |
register int x, i; |
| 726 |
> |
int y, i; |
| 727 |
> |
int x, rg; |
| 728 |
|
|
| 729 |
|
if (fseek(stdin, 0L, 0) == EOF) { |
| 730 |
|
fprintf(stderr, "%s: cannot seek on input picture\n", progname); |
| 750 |
|
exit(1); |
| 751 |
|
} |
| 752 |
|
for (x = 0; x < xmax; x++) { |
| 753 |
< |
i = chartndx(x, y, CENTCVG); |
| 754 |
< |
if (i < 0) |
| 753 |
> |
rg = chartndx(x, y, &i); |
| 754 |
> |
if (rg == RG_CENT) { |
| 755 |
> |
if (!(1L<<i & gmtflags) || (x+y)&07) { |
| 756 |
> |
copycolor(scan[x], mbRGB[i]); |
| 757 |
> |
clipgamut(scan[x], bright(scan[x]), |
| 758 |
> |
CGAMUT, colmin, colmax); |
| 759 |
> |
} else |
| 760 |
> |
copycolor(scan[x], blkcol); |
| 761 |
> |
} else if (rg == RG_CORR) |
| 762 |
|
cvtcolor(scan[x], scan[x]); |
| 763 |
< |
else |
| 764 |
< |
copycolor(scan[x], mbRGB[i]); |
| 763 |
> |
else if (rg != RG_ORIG) |
| 764 |
> |
copycolor(scan[x], blkcol); |
| 765 |
|
} |
| 766 |
|
if (fwritescan(scan, xmax, debugfp) < 0) { |
| 767 |
|
fprintf(stderr, "%s: error writing debugging picture\n", |
| 771 |
|
} |
| 772 |
|
/* clean up */ |
| 773 |
|
fclose(debugfp); |
| 774 |
< |
free((char *)scan); |
| 774 |
> |
free((void *)scan); |
| 775 |
|
} |
| 776 |
|
|
| 777 |
|
|
| 778 |
< |
clrdebug() /* put out debug picture from color input */ |
| 778 |
> |
static void |
| 779 |
> |
clrdebug(void) /* put out debug picture from color input */ |
| 780 |
|
{ |
| 781 |
|
static COLR blkclr = BLKCOLR; |
| 782 |
< |
COLR mbclr[24], cvclr[24]; |
| 782 |
> |
COLR mbclr[24], cvclr[24], orclr[24]; |
| 783 |
|
COLR *scan; |
| 784 |
< |
COLOR ctmp; |
| 785 |
< |
int y; |
| 786 |
< |
register int i, x; |
| 784 |
> |
COLOR ctmp, ct2; |
| 785 |
> |
int y, i; |
| 786 |
> |
int x, rg; |
| 787 |
|
/* convert colors */ |
| 788 |
|
for (i = 0; i < 24; i++) { |
| 789 |
< |
setcolr(mbclr[i], colval(mbRGB[i],RED), |
| 790 |
< |
colval(mbRGB[i],GRN), colval(mbRGB[i],BLU)); |
| 789 |
> |
copycolor(ctmp, mbRGB[i]); |
| 790 |
> |
clipgamut(ctmp, bright(ctmp), CGAMUT, cblack, cwhite); |
| 791 |
> |
setcolr(mbclr[i], colval(ctmp,RED), |
| 792 |
> |
colval(ctmp,GRN), colval(ctmp,BLU)); |
| 793 |
|
if (inpflags & 1L<<i) { |
| 794 |
< |
cvtcolor(ctmp, inpRGB[i]); |
| 795 |
< |
setcolr(cvclr[i], colval(ctmp,RED), |
| 794 |
> |
copycolor(ctmp, inpRGB[i]); |
| 795 |
> |
clipgamut(ctmp, bright(ctmp), CGAMUT, cblack, cwhite); |
| 796 |
> |
setcolr(orclr[i], colval(ctmp,RED), |
| 797 |
|
colval(ctmp,GRN), colval(ctmp,BLU)); |
| 798 |
+ |
if (rawmap) |
| 799 |
+ |
copycolr(cvclr[i], mbclr[i]); |
| 800 |
+ |
else { |
| 801 |
+ |
bresp(ctmp, inpRGB[i]); |
| 802 |
+ |
colortrans(ct2, solmat, ctmp); |
| 803 |
+ |
clipgamut(ct2, bright(ct2), CGAMUT, |
| 804 |
+ |
cblack, cwhite); |
| 805 |
+ |
setcolr(cvclr[i], colval(ct2,RED), |
| 806 |
+ |
colval(ct2,GRN), |
| 807 |
+ |
colval(ct2,BLU)); |
| 808 |
+ |
} |
| 809 |
|
} |
| 810 |
|
} |
| 811 |
|
/* allocate scanline */ |
| 820 |
|
fprtresolu(xmax, ymax, debugfp); |
| 821 |
|
/* write debug picture */ |
| 822 |
|
for (y = ymax-1; y >= 0; y--) { |
| 823 |
< |
for (x = 0; x < xmax; x++) |
| 824 |
< |
if ((i = chartndx(x, y, CENTCVG)) >= 0) |
| 825 |
< |
copycolr(scan[x], mbclr[i]); |
| 826 |
< |
else if ((i = chartndx(x, y, FULLCVG)) >= 0 && |
| 827 |
< |
inpflags & 1L<<i) |
| 828 |
< |
copycolr(scan[x], cvclr[i]); |
| 829 |
< |
else |
| 823 |
> |
for (x = 0; x < xmax; x++) { |
| 824 |
> |
rg = chartndx(x, y, &i); |
| 825 |
> |
if (rg == RG_CENT) { |
| 826 |
> |
if (!(1L<<i & gmtflags) || (x+y)&07) |
| 827 |
> |
copycolr(scan[x], mbclr[i]); |
| 828 |
> |
else |
| 829 |
> |
copycolr(scan[x], blkclr); |
| 830 |
> |
} else if (rg == RG_BORD || !(1L<<i & inpflags)) |
| 831 |
|
copycolr(scan[x], blkclr); |
| 832 |
+ |
else if (rg == RG_ORIG) |
| 833 |
+ |
copycolr(scan[x], orclr[i]); |
| 834 |
+ |
else /* rg == RG_CORR */ |
| 835 |
+ |
copycolr(scan[x], cvclr[i]); |
| 836 |
+ |
} |
| 837 |
|
if (fwritecolrs(scan, xmax, debugfp) < 0) { |
| 838 |
|
fprintf(stderr, "%s: error writing debugging picture\n", |
| 839 |
|
progname); |
| 842 |
|
} |
| 843 |
|
/* clean up */ |
| 844 |
|
fclose(debugfp); |
| 845 |
< |
free((char *)scan); |
| 845 |
> |
free((void *)scan); |
| 846 |
> |
} |
| 847 |
> |
|
| 848 |
> |
|
| 849 |
> |
static void |
| 850 |
> |
getpos( /* get boundary position */ |
| 851 |
> |
char *name, |
| 852 |
> |
int bnds[2], |
| 853 |
> |
FILE *fp |
| 854 |
> |
) |
| 855 |
> |
{ |
| 856 |
> |
char buf[64]; |
| 857 |
> |
|
| 858 |
> |
fprintf(stderr, "\tSelect corner: %s\n", name); |
| 859 |
> |
if (fgets(buf, sizeof(buf), fp) == NULL || |
| 860 |
> |
sscanf(buf, "%d %d", &bnds[0], &bnds[1]) != 2) { |
| 861 |
> |
fprintf(stderr, "%s: read error from display process\n", |
| 862 |
> |
progname); |
| 863 |
> |
exit(1); |
| 864 |
> |
} |
| 865 |
> |
} |
| 866 |
> |
|
| 867 |
> |
|
| 868 |
> |
static void |
| 869 |
> |
pickchartpos( /* display picture and pick chart location */ |
| 870 |
> |
char *pfn |
| 871 |
> |
) |
| 872 |
> |
{ |
| 873 |
> |
char combuf[PATH_MAX]; |
| 874 |
> |
FILE *pfp; |
| 875 |
> |
|
| 876 |
> |
sprintf(combuf, DISPCOM, pfn); |
| 877 |
> |
if ((pfp = popen(combuf, "r")) == NULL) { |
| 878 |
> |
perror(combuf); |
| 879 |
> |
exit(1); |
| 880 |
> |
} |
| 881 |
> |
fputs("Use middle mouse button to select chart corners:\n", stderr); |
| 882 |
> |
getpos("upper left (dark skin)", bounds[0], pfp); |
| 883 |
> |
getpos("upper right (bluish green)", bounds[1], pfp); |
| 884 |
> |
getpos("lower left (white)", bounds[2], pfp); |
| 885 |
> |
getpos("lower right (black)", bounds[3], pfp); |
| 886 |
> |
fputs("Got it -- quit display program.\n", stderr); |
| 887 |
> |
pclose(pfp); |
| 888 |
|
} |
