--- ray/src/px/macbethcal.c 2004/03/28 20:33:13 2.23 +++ ray/src/px/macbethcal.c 2024/02/22 02:07:40 2.29 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: macbethcal.c,v 2.23 2004/03/28 20:33:13 schorsch Exp $"; +static const char RCSid[] = "$Id: macbethcal.c,v 2.29 2024/02/22 02:07:40 greg Exp $"; #endif /* * Calibrate a scanned MacBeth Color Checker Chart @@ -10,12 +10,10 @@ static const char RCSid[] = "$Id: macbethcal.c,v 2.23 * Warping code depends on conformance of COLOR and W3VEC types. */ -#include #include -#include #include "platform.h" -#include "rtprocess.h" +#include "paths.h" #include "rtio.h" #include "color.h" #include "resolu.h" @@ -48,33 +46,33 @@ static const char RCSid[] = "$Id: macbethcal.c,v 2.23 #define Neutral5 21 #define Neutral35 22 #define Black 23 - /* computed from 5nm spectral measurements */ + /* computed from 10nm spectral measurements */ /* CIE 1931 2 degree obs, equal-energy white */ float mbxyY[24][3] = { - {0.462, 0.3769, 0.0932961}, /* DarkSkin */ - {0.4108, 0.3542, 0.410348}, /* LightSkin */ - {0.2626, 0.267, 0.181554}, /* BlueSky */ - {0.36, 0.4689, 0.108447}, /* Foliage */ - {0.2977, 0.2602, 0.248407}, /* BlueFlower */ - {0.2719, 0.3485, 0.401156}, /* BluishGreen */ - {0.52, 0.4197, 0.357899}, /* Orange */ - {0.229, 0.1866, 0.103911}, /* PurplishBlue */ - {0.4909, 0.3262, 0.242615}, /* ModerateRed */ - {0.3361, 0.2249, 0.0600102}, /* Purple */ - {0.3855, 0.4874, 0.42963}, /* YellowGreen */ - {0.4853, 0.4457, 0.476343}, /* OrangeYellow */ - {0.2026, 0.1369, 0.0529249}, /* Blue */ - {0.3007, 0.4822, 0.221226}, /* Green */ - {0.5805, 0.3238, 0.162167}, /* Red */ - {0.4617, 0.472, 0.64909}, /* Yellow */ - {0.4178, 0.2625, 0.233662}, /* Magenta */ - {0.2038, 0.2508, 0.167275}, /* Cyan */ - {0.3358, 0.337, 0.916877}, /* White */ - {0.3338, 0.3348, 0.604678}, /* Neutral.8 */ - {0.3333, 0.3349, 0.364566}, /* Neutral.65 */ - {0.3353, 0.3359, 0.200238}, /* Neutral.5 */ - {0.3363, 0.336, 0.0878721}, /* Neutral.35 */ - {0.3346, 0.3349, 0.0308383} /* Black */ + {0.421236, 0.361196, 0.103392}, /* DarkSkin */ + {0.40868, 0.358157, 0.352867}, /* LightSkin */ + {0.265063, 0.271424, 0.185124}, /* BlueSky */ + {0.362851, 0.43055, 0.132625}, /* Foliage */ + {0.28888, 0.260851, 0.233138}, /* BlueFlower */ + {0.277642, 0.365326, 0.416443}, /* BluishGreen */ + {0.524965, 0.40068, 0.312039}, /* Orange */ + {0.225018, 0.190392, 0.114999}, /* PurplishBlue */ + {0.487199, 0.315372, 0.198616}, /* ModerateRed */ + {0.314245, 0.227231, 0.0646047}, /* Purple */ + {0.396202, 0.489732, 0.440724}, /* YellowGreen */ + {0.493297, 0.435299, 0.43444}, /* OrangeYellow */ + {0.198191, 0.149265, 0.0588122}, /* Blue */ + {0.322838, 0.487601, 0.229258}, /* Green */ + {0.561833, 0.321165, 0.126978}, /* Red */ + {0.468113, 0.467021, 0.605289}, /* Yellow */ + {0.397128, 0.248535, 0.201761}, /* Magenta */ + {0.209552, 0.276256, 0.190917}, /* Cyan */ + {0.337219, 0.339042, 0.912482}, /* White */ + {0.333283, 0.335077, 0.588297}, /* Neutral.8 */ + {0.332747, 0.334371, 0.3594}, /* Neutral.65 */ + {0.331925, 0.334202, 0.19114}, /* Neutral.5 */ + {0.330408, 0.332615, 0.0892964}, /* Neutral.35 */ + {0.331841, 0.331405, 0.0319541}, /* Black */ }; COLOR mbRGB[24]; /* MacBeth RGB values */ @@ -101,7 +99,7 @@ short mbneu[NMBNEU] = {Black,Neutral35,Neutral5,Neutra #define RG_CORR 04 /* corrected color region */ #ifndef DISPCOM -#define DISPCOM "ximage -op \"%s\"" +#define DISPCOM "ximage -e auto -op \"%s\"" #endif int scanning = 1; /* scanned input (or recorded output)? */ @@ -236,13 +234,13 @@ main( getcolors(); compute(); /* compute color mapping */ if (rawmap) { /* print out raw correspondence */ - register int j; + int j; printf("# Color correspondence produced by:\n#\t\t"); printargs(argc, argv, stdout); - printf("#\tUsage: pcwarp %s uncorrected.pic > corrected.pic\n", + printf("#\tUsage: pcwarp %s uncorrected.hdr > corrected.hdr\n", i+1 < argc ? argv[i+1] : "{this_file}"); - printf("#\t Or: pcond [options] -m %s orig.pic > output.pic\n", + printf("#\t Or: pcond [options] -m %s orig.hdr > output.hdr\n", i+1 < argc ? argv[i+1] : "{this_file}"); for (j = 0; j < 24; j++) printf("%f %f %f %f %f %f\n", @@ -255,10 +253,10 @@ main( /* print header */ printf("{\n\tColor correction file computed by:\n\t\t"); printargs(argc, argv, stdout); - printf("\n\tUsage: pcomb -f %s uncorrected.pic > corrected.pic\n", + printf("\n\tUsage: pcomb -f %s uncorrected.hdr > corrected.hdr\n", i+1 < argc ? argv[i+1] : "{this_file}"); if (!scanning) - printf("\t Or: pcond [options] -f %s orig.pic > output.pic\n", + printf("\t Or: pcond [options] -f %s orig.hdr > output.hdr\n", i+1 < argc ? argv[i+1] : "{this_file}"); printf("}\n"); putmapping(); /* put out color mapping */ @@ -272,9 +270,9 @@ main( exit(0); userr: fprintf(stderr, -"Usage: %s [-d dbg.pic][-P | -p xul yul xur yur xll yll xlr ylr][-i irrad][-m] input.pic [output.{cal|cwp}]\n", +"Usage: %s [-d dbg.hdr][-P | -p xul yul xur yur xll yll xlr ylr][-i irrad][-m] input.hdr [output.{cal|cwp}]\n", progname); - fprintf(stderr, " or: %s [-d dbg.pic][-i irrad][-m] -c [xyY.dat [output.{cal|cwp}]]\n", + fprintf(stderr, " or: %s [-d dbg.hdr][-i irrad][-m] -c [xyY.dat [output.{cal|cwp}]]\n", progname); exit(1); return 1; /* pro forma return */ @@ -285,7 +283,7 @@ static void init(void) /* initialize */ { double quad[4][2]; - register int i; + int i; /* make coordinate transformation */ quad[0][0] = bounds[0][0]; quad[0][1] = bounds[0][1]; @@ -325,16 +323,16 @@ chartndx( /* find color number for position */ mx3d_transform(ipos, imgxfm, cpos); cpos[0] /= cpos[2]; cpos[1] /= cpos[2]; - if (cpos[0] < 0. || cpos[0] >= 6. || cpos[1] < 0. || cpos[1] >= 4.) + if ((cpos[0] < 0.) | (cpos[0] >= 6.) | (cpos[1] < 0.) | (cpos[1] >= 4.)) return(RG_BORD); ix = cpos[0]; iy = cpos[1]; fx = cpos[0] - ix; fy = cpos[1] - iy; *np = iy*6 + ix; - if (fx >= 0.35 && fx < 0.65 && fy >= 0.35 && fy < 0.65) + if ((fx >= 0.35) & (fx < 0.65) & (fy >= 0.35) & (fy < 0.65)) return(RG_CENT); - if (fx < 0.05 || fx >= 0.95 || fy < 0.05 || fy >= 0.95) + if ((fx < 0.05) | (fx >= 0.95) | (fy < 0.05) | (fy >= 0.95)) return(RG_BORD); if (fx >= 0.5) /* right side is corrected */ return(RG_CORR); @@ -350,7 +348,7 @@ getpicture(void) /* load in picture colors */ int ccount[24]; double d; int y, i; - register int x; + int x; scanln = (COLR *)malloc(xmax*sizeof(COLR)); if (scanln == NULL) { @@ -440,7 +438,7 @@ bresp( /* piecewise linear interpolation of primaries COLOR x ) { - register int i, n; + int i, n; for (i = 0; i < 3; i++) { for (n = 0; n < NMBNEU-2; n++) @@ -461,7 +459,7 @@ compute(void) /* compute color mapping */ COLOR clrin[24], clrout[24]; long cflags; COLOR ctmp; - register int i, n; + int i, n; /* did we get what we need? */ if ((inpflags & REQFLGS) != REQFLGS) { fprintf(stderr, "%s: missing required input colors\n", @@ -471,6 +469,13 @@ compute(void) /* compute color mapping */ /* compute piecewise luminance curve */ for (i = 0; i < NMBNEU; i++) { copycolor(bramp[i][0], inpRGB[mbneu[i]]); + for (n = 3*(i>0); n--; ) + if (colval(bramp[i][0],n) <= + colval(bramp[i-1][0],n)+1e-7) { + fprintf(stderr, + "%s: non-increasing neutral patch\n", progname); + exit(1); + } copycolor(bramp[i][1], mbRGB[mbneu[i]]); } /* compute color space gamut */ @@ -483,7 +488,7 @@ compute(void) /* compute color mapping */ colval(colmin,i) = colval(bramp[0][0],i) - colval(bramp[0][1],i) * (colval(bramp[1][0],i)-colval(bramp[0][0],i)) / - (colval(bramp[1][1],i)-colval(bramp[1][0],i)); + (colval(bramp[1][1],i)-colval(bramp[0][1],i)); colval(colmax,i) = colval(bramp[NMBNEU-2][0],i) + (1.-colval(bramp[NMBNEU-2][1],i)) * (colval(bramp[NMBNEU-1][0],i) - @@ -502,10 +507,9 @@ compute(void) /* compute color mapping */ n++; } compsoln(clrin, clrout, n); - if (irrad > 0.99 && irrad < 1.01) /* check gamut */ - for (i = 0; i < 24; i++) - if (cflags & 1L<