--- ray/src/px/macbethcal.c	1995/10/11 18:52:00	2.3
+++ ray/src/px/macbethcal.c	2003/07/27 22:12:03	2.20
@@ -1,25 +1,52 @@
-/* Copyright (c) 1995 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: macbethcal.c,v 2.20 2003/07/27 22:12:03 schorsch Exp $";
 #endif
-
 /*
  * Calibrate a scanned MacBeth Color Checker Chart
  *
- * Produce a .cal file suitable for use with pcomb.
+ * Produce a .cal file suitable for use with pcomb,
+ * or .cwp file suitable for use with pcwarp.
+ *
+ * Warping code depends on conformance of COLOR and W3VEC types.
  */
 
 #include <stdio.h>
-#ifdef MSDOS
-#include <fcntl.h>
-#endif
+#include <math.h>
+#include <time.h>
+
+#include "platform.h"
 #include "color.h"
 #include "resolu.h"
 #include "pmap.h"
+#include "warp3d.h"
 
-				/* MacBeth colors (CIE 1931, absolute white) */
-				/* computed from spectral measurements */
+				/* MacBeth colors */
+#define	DarkSkin	0
+#define	LightSkin	1
+#define	BlueSky		2
+#define	Foliage		3
+#define	BlueFlower	4
+#define	BluishGreen	5
+#define	Orange		6
+#define	PurplishBlue	7
+#define	ModerateRed	8
+#define	Purple		9
+#define	YellowGreen	10
+#define	OrangeYellow	11
+#define	Blue		12
+#define	Green		13
+#define	Red		14
+#define	Yellow		15
+#define	Magenta		16
+#define	Cyan		17
+#define	White		18
+#define	Neutral8	19
+#define	Neutral65	20
+#define	Neutral5	21
+#define	Neutral35	22
+#define	Black		23
+				/* computed from 5nm 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 */
@@ -50,27 +77,52 @@ float	mbxyY[24][3] = {
 COLOR	mbRGB[24];		/* MacBeth RGB values */
 
 #define	NMBNEU		6	/* Number of MacBeth neutral colors */
-short	mbneu[NMBNEU] = {23,22,21,20,19,18};
-#define NMBMOD		16	/* Number of MacBeth unsaturated colors */
-short	mbmod[NMBMOD] = {0,1,2,3,4,5,6,7,8,9,10,11,19,20,21,22};
-#define NMBSAT		6	/* Number of MacBeth saturated colors */
-short	mbsat[NMBSAT] = {14,12,13,15,16,17};
+short	mbneu[NMBNEU] = {Black,Neutral35,Neutral5,Neutral65,Neutral8,White};
 
+#define  NEUFLGS	(1L<<White|1L<<Neutral8|1L<<Neutral65| \
+				1L<<Neutral5|1L<<Neutral35|1L<<Black)
+
+#define  SATFLGS	(1L<<Red|1L<<Green|1L<<Blue|1L<<Magenta|1L<<Yellow| \
+			1L<<Cyan|1L<<Orange|1L<<Purple|1L<<PurplishBlue| \
+			1L<<YellowGreen|1<<OrangeYellow|1L<<BlueFlower)
+
+#define  UNSFLGS	(1L<<DarkSkin|1L<<LightSkin|1L<<BlueSky|1L<<Foliage| \
+			1L<<BluishGreen|1L<<ModerateRed)
+
+#define  REQFLGS	NEUFLGS			/* need these colors */
+#define  MODFLGS	(NEUFLGS|UNSFLGS)	/* should be in gamut */
+
+#define  RG_BORD	0	/* patch border */
+#define  RG_CENT	01	/* central region of patch */
+#define  RG_ORIG	02	/* original color region */
+#define  RG_CORR	04	/* corrected color region */
+
+#ifndef  DISPCOM
+#define  DISPCOM	"ximage -op %s"
+#endif
+
+int	scanning = 1;		/* scanned input (or recorded output)? */
+double	irrad = 1.0;		/* irradiance multiplication factor */
+int	rawmap = 0;		/* put out raw color mapping? */
+
 int	xmax, ymax;		/* input image dimensions */
 int	bounds[4][2];		/* image coordinates of chart corners */
 double	imgxfm[3][3];		/* coordinate transformation matrix */
 
-COLOR	picRGB[24];		/* picture colors */
+COLOR	inpRGB[24];		/* measured or scanned input colors */
+long	inpflags = 0;		/* flags of which colors were input */
+long	gmtflags = 0;		/* flags of out-of-gamut colors */
 
 COLOR	bramp[NMBNEU][2];	/* brightness ramp (per primary) */
-double	solmat[3][3];		/* color mapping matrix */
+COLORMAT	solmat;		/* color mapping matrix */
+COLOR	colmin, colmax;		/* gamut limits */
 
-FILE	*debugfp = NULL;
+WARP3D	*wcor = NULL;		/* color space warp */
+
+FILE	*debugfp = NULL;	/* debug output picture */
 char	*progname;
 
-extern char	*malloc();
 
-
 main(argc, argv)
 int	argc;
 char	**argv;
@@ -78,60 +130,130 @@ char	**argv;
 	int	i;
 
 	progname = argv[0];
-	if (argc > 2 && !strcmp(argv[1], "-d")) {	/* debug output */
-		if ((debugfp = fopen(argv[2], "w")) == NULL) {
-			perror(argv[2]);
-			exit(1);
+	for (i = 1; i < argc && argv[i][0] == '-'; i++)
+		switch (argv[i][1]) {
+		case 'd':				/* debug output */
+			i++;
+			if (badarg(argc-i, argv+i, "s"))
+				goto userr;
+			if ((debugfp = fopen(argv[i], "w")) == NULL) {
+				perror(argv[i]);
+				exit(1);
+			}
+			SET_FILE_BINARY(debugfp);
+			newheader("RADIANCE", debugfp);		/* start */
+			printargs(argc, argv, debugfp);		/* header */
+			break;
+		case 'p':				/* picture position */
+			if (badarg(argc-i-1, argv+i+1, "iiiiiiii"))
+				goto userr;
+			bounds[0][0] = atoi(argv[++i]);
+			bounds[0][1] = atoi(argv[++i]);
+			bounds[1][0] = atoi(argv[++i]);
+			bounds[1][1] = atoi(argv[++i]);
+			bounds[2][0] = atoi(argv[++i]);
+			bounds[2][1] = atoi(argv[++i]);
+			bounds[3][0] = atoi(argv[++i]);
+			bounds[3][1] = atoi(argv[++i]);
+			scanning = 2;
+			break;
+		case 'P':				/* pick position */
+			scanning = 3;
+			break;
+		case 'i':				/* irradiance factor */
+			i++;
+			if (badarg(argc-i, argv+i, "f"))
+				goto userr;
+			irrad = atof(argv[i]);
+			break;
+		case 'm':				/* raw map output */
+			rawmap = 1;
+			break;
+		case 'c':				/* color input */
+			scanning = 0;
+			break;
+		default:
+			goto userr;
 		}
-#ifdef MSDOS
-		setmode(fileno(debugfp), O_BINARY);
-#endif
-		newheader("RADIANCE", debugfp);
-		printargs(argc, argv, debugfp);
-		argv += 2;
-		argc -= 2;
-	}
-	if (argc != 3 && argc != 11)
-		goto userr;
-	if (strcmp(argv[1], "-") && freopen(argv[1], "r", stdin) == NULL) {
-		perror(argv[1]);
+							/* open files */
+	if (i < argc && freopen(argv[i], "r", stdin) == NULL) {
+		perror(argv[i]);
 		exit(1);
 	}
-	if (strcmp(argv[2], "-") && freopen(argv[2], "w", stdout) == NULL) {
-		perror(argv[2]);
+	if (i+1 < argc && freopen(argv[i+1], "w", stdout) == NULL) {
+		perror(argv[i+1]);
 		exit(1);
 	}
-#ifdef MSDOS
-	setmode(fileno(stdin), O_BINARY);
-#endif
-	if (checkheader(stdin, COLRFMT, NULL) < 0 ||
-			fgetresolu(&xmax, &ymax, stdin) < 0) {
-		fprintf(stderr, "%s: bad input picture\n", progname);
-		exit(1);
-	}
-					/* get chart boundaries */
-	if (argc == 11) {
-		for (i = 0; i < 4; i++) {
-			if (!isint(argv[2*i+3]) | !isint(argv[2*i+4]))
+	if (scanning) {			/* load input picture header */
+		SET_FILE_BINARY(stdin);
+		if (checkheader(stdin, COLRFMT, NULL) < 0 ||
+				fgetresolu(&xmax, &ymax, stdin) < 0) {
+			fprintf(stderr, "%s: bad input picture\n", progname);
+			exit(1);
+		}
+		if (scanning == 3) {
+			if (i >= argc)
 				goto userr;
-			bounds[i][0] = atoi(argv[2*i+3]);
-			bounds[i][1] = atoi(argv[2*i+4]);
+			pickchartpos(argv[i]);
+			scanning = 2;
 		}
-	} else {
+	} else {			/* else set default xmax and ymax */
+		xmax = 512;
+		ymax = 2*512/3;
+	}
+	if (scanning != 2) {		/* use default boundaries */
 		bounds[0][0] = bounds[2][0] = .029*xmax + .5;
 		bounds[0][1] = bounds[1][1] = .956*ymax + .5;
 		bounds[1][0] = bounds[3][0] = .971*xmax + .5;
 		bounds[2][1] = bounds[3][1] = .056*ymax + .5;
 	}
 	init();				/* initialize */
-	getcolors();			/* get picture colors */
+	if (scanning)			/* get picture colors */
+		getpicture();
+	else
+		getcolors();
 	compute();			/* compute color mapping */
-	putmapping();			/* put out color mapping */
-	putdebug();			/* put out debug picture */
+	if (rawmap) {			/* print out raw correspondence */
+		register int	j;
+
+		printf("# Color correspondence produced by:\n#\t\t");
+		printargs(argc, argv, stdout);
+		printf("#\tUsage: pcwarp %s uncorrected.pic > corrected.pic\n",
+				i+1 < argc ? argv[i+1] : "{this_file}");
+		printf("#\t   Or: pcond [options] -m %s orig.pic > output.pic\n",
+				i+1 < argc ? argv[i+1] : "{this_file}");
+		for (j = 0; j < 24; j++)
+			printf("%f %f %f    %f %f %f\n",
+				colval(inpRGB[j],RED), colval(inpRGB[j],GRN),
+				colval(inpRGB[j],BLU), colval(mbRGB[j],RED),
+				colval(mbRGB[j],GRN), colval(mbRGB[j],BLU));
+		if (scanning && debugfp != NULL)
+			cwarp();		/* color warp for debugging */
+	} else {			/* print color mapping */
+						/* 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",
+				i+1 < argc ? argv[i+1] : "{this_file}");
+		if (!scanning)
+			printf("\t   Or: pcond [options] -f %s orig.pic > output.pic\n",
+					i+1 < argc ? argv[i+1] : "{this_file}");
+		printf("}\n");
+		putmapping();			/* put out color mapping */
+	}
+	if (debugfp != NULL) {		/* put out debug picture */
+		if (scanning)
+			picdebug();
+		else
+			clrdebug();
+	}
 	exit(0);
 userr:
-	fprintf(stderr, "Usage: %s [-d dbg.pic] input.pic output.cal [xul yul xur yur xll yll xlr ylr]\n",
+	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",
 			progname);
+	fprintf(stderr, "   or: %s [-d dbg.pic][-i irrad][-m] -c [xyY.dat [output.{cal|cwp}]]\n",
+			progname);
 	exit(1);
 }
 
@@ -139,6 +261,7 @@ userr:
 init()				/* initialize */
 {
 	double	quad[4][2];
+	register int	i;
 					/* make coordinate transformation */
 	quad[0][0] = bounds[0][0];
 	quad[0][1] = bounds[0][1];
@@ -153,12 +276,18 @@ init()				/* initialize */
 		fprintf(stderr, "%s: bad chart boundaries\n", progname);
 		exit(1);
 	}
+					/* map MacBeth colors to RGB space */
+	for (i = 0; i < 24; i++) {
+		xyY2RGB(mbRGB[i], mbxyY[i]);
+		scalecolor(mbRGB[i], irrad);
+	}
 }
 
 
 int
-chartndx(x, y)				/* find color number for position */
+chartndx(x, y, np)			/* find color number for position */
 int	x, y;
+int	*np;
 {
 	double	ipos[3], cpos[3];
 	int	ix, iy;
@@ -171,25 +300,30 @@ int	x, y;
 	cpos[0] /= cpos[2];
 	cpos[1] /= cpos[2];
 	if (cpos[0] < 0. || cpos[0] >= 6. || cpos[1] < 0. || cpos[1] >= 4.)
-		return(-1);
+		return(RG_BORD);
 	ix = cpos[0];
 	iy = cpos[1];
 	fx = cpos[0] - ix;
 	fy = cpos[1] - iy;
-	if (fx < .35 || fx >= .65 || fy < .35 || fy >= .65)
-		return(-1);
-	return(iy*6 + ix);
+	*np = iy*6 + ix;
+	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)
+		return(RG_BORD);
+	if (fx >= 0.5)			/* right side is corrected */
+		return(RG_CORR);
+	return(RG_ORIG);		/* left side is original */
 }
 
 
-getcolors()				/* load in picture colors */
+getpicture()				/* load in picture colors */
 {
 	COLR	*scanln;
 	COLOR	pval;
 	int	ccount[24];
 	double	d;
-	int	y;
-	register int	x, i;
+	int	y, i;
+	register int	x;
 
 	scanln = (COLR *)malloc(xmax*sizeof(COLR));
 	if (scanln == NULL) {
@@ -197,7 +331,7 @@ getcolors()				/* load in picture colors */
 		exit(1);
 	}
 	for (i = 0; i < 24; i++) {
-		setcolor(picRGB[i], 0., 0., 0.);
+		setcolor(inpRGB[i], 0., 0., 0.);
 		ccount[i] = 0;
 	}
 	for (y = ymax-1; y >= 0; y--) {
@@ -206,78 +340,149 @@ getcolors()				/* load in picture colors */
 					progname);
 			exit(1);
 		}
-		for (x = 0; x < xmax; x++) {
-			i = chartndx(x, y);
-			if (i >= 0) {
+		for (x = 0; x < xmax; x++)
+			if (chartndx(x, y, &i) == RG_CENT) {
 				colr_color(pval, scanln[x]);
-				addcolor(picRGB[i], pval);
+				addcolor(inpRGB[i], pval);
 				ccount[i]++;
 			}
+	}
+	for (i = 0; i < 24; i++) {		/* compute averages */
+		if (ccount[i] == 0)
+			continue;
+		d = 1./ccount[i];
+		scalecolor(inpRGB[i], d);
+		inpflags |= 1L<<i;
+	}
+	free((void *)scanln);
+}
+
+
+getcolors()			/* get xyY colors from standard input */
+{
+	int	gotwhite = 0;
+	COLOR	whiteclr;
+	int	n;
+	float	xyYin[3];
+
+	while (fgetval(stdin, 'i', &n) == 1) {		/* read colors */
+		if ((n < 0) | (n > 24) ||
+				fgetval(stdin, 'f', &xyYin[0]) != 1 ||
+				fgetval(stdin, 'f', &xyYin[1]) != 1 ||
+				fgetval(stdin, 'f', &xyYin[2]) != 1 ||
+				(xyYin[0] < 0.) | (xyYin[1] < 0.) ||
+				xyYin[0] + xyYin[1] > 1.) {
+			fprintf(stderr, "%s: bad color input data\n",
+					progname);
+			exit(1);
 		}
+		if (n == 0) {				/* calibration white */
+			xyY2RGB(whiteclr, xyYin);
+			gotwhite++;
+		} else {				/* standard color */
+			n--;
+			xyY2RGB(inpRGB[n], xyYin);
+			inpflags |= 1L<<n;
+		}
 	}
-	for (i = 0; i < 24; i++) {
-		if (ccount[i] == 0) {
-			fprintf(stderr, "%s: bad chart boundaries\n",
+					/* normalize colors */
+	if (!gotwhite) {
+		if (!(inpflags & 1L<<White)) {
+			fprintf(stderr, "%s: missing input for White\n",
 					progname);
 			exit(1);
 		}
-		d = 1.0/ccount[i];
-		scalecolor(picRGB[i], d);
+		setcolor(whiteclr,
+			colval(inpRGB[White],RED)/colval(mbRGB[White],RED),
+			colval(inpRGB[White],GRN)/colval(mbRGB[White],GRN),
+			colval(inpRGB[White],BLU)/colval(mbRGB[White],BLU));
 	}
-	free((char *)scanln);
+	for (n = 0; n < 24; n++)
+		if (inpflags & 1L<<n)
+			setcolor(inpRGB[n],
+				colval(inpRGB[n],RED)/colval(whiteclr,RED),
+				colval(inpRGB[n],GRN)/colval(whiteclr,GRN),
+				colval(inpRGB[n],BLU)/colval(whiteclr,BLU));
 }
 
 
 bresp(y, x)		/* piecewise linear interpolation of primaries */
 COLOR	y, x;
 {
-	double	cv[3];
 	register int	i, n;
 
 	for (i = 0; i < 3; i++) {
-		n = NMBNEU;
-		while (n > 0 && colval(x,i) < colval(bramp[--n][0],i))
-			;
-		cv[i] = ((colval(bramp[n+1][0],i) - colval(x,i)) *
+		for (n = 0; n < NMBNEU-2; n++)
+			if (colval(x,i) < colval(bramp[n+1][0],i))
+				break;
+		colval(y,i) = ((colval(bramp[n+1][0],i) - colval(x,i)) *
 						colval(bramp[n][1],i) +
 				(colval(x,i) - colval(bramp[n][0],i)) *
 						colval(bramp[n+1][1],i)) /
 			(colval(bramp[n+1][0],i) - colval(bramp[n][0],i));
-		if (cv[i] < 0.) cv[i] = 0.;
 	}
-	setcolor(y, cv[0], cv[1], cv[2]);
 }
 
 
 compute()			/* compute color mapping */
 {
-	COLOR	clrin[NMBMOD], clrout[NMBMOD];
+	COLOR	clrin[24], clrout[24];
+	long	cflags;
 	COLOR	ctmp;
-	double	d;
-	register int	i;
-					/* map MacBeth colors to RGB space */
-	for (i = 0; i < 24; i++) {
-		d = mbxyY[i][2] / mbxyY[i][1];
-		ctmp[0] = mbxyY[i][0] * d;
-		ctmp[1] = mbxyY[i][2];
-		ctmp[2] = (1. - mbxyY[i][0] - mbxyY[i][1]) * d;
-		cie_rgb(mbRGB[i], ctmp);
+	register int	i, n;
+					/* did we get what we need? */
+	if ((inpflags & REQFLGS) != REQFLGS) {
+		fprintf(stderr, "%s: missing required input colors\n",
+				progname);
+		exit(1);
 	}
 					/* compute piecewise luminance curve */
 	for (i = 0; i < NMBNEU; i++) {
-		copycolor(bramp[i][0], picRGB[mbneu[i]]);
+		copycolor(bramp[i][0], inpRGB[mbneu[i]]);
 		copycolor(bramp[i][1], mbRGB[mbneu[i]]);
 	}
-					/* compute color matrix */
-	for (i = 0; i < NMBMOD; i++) {
-		bresp(clrin[i], picRGB[mbmod[i]]);
-		copycolor(clrout[i], mbRGB[mbmod[i]]);
-	}
-	compsoln(clrin, clrout, NMBMOD);
+					/* compute color space gamut */
+	if (scanning) {
+		copycolor(colmin, cblack);
+		copycolor(colmax, cwhite);
+		scalecolor(colmax, irrad);
+	} else
+		for (i = 0; i < 3; i++) {
+			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(colmax,i) = colval(bramp[NMBNEU-2][0],i) +
+				(1.-colval(bramp[NMBNEU-2][1],i)) *
+				(colval(bramp[NMBNEU-1][0],i) -
+					colval(bramp[NMBNEU-2][0],i)) /
+				(colval(bramp[NMBNEU-1][1],i) -
+					colval(bramp[NMBNEU-2][1],i));
+		}
+					/* compute color mapping */
+	do {
+		cflags = inpflags & ~gmtflags;
+		n = 0;				/* compute transform matrix */
+		for (i = 0; i < 24; i++)
+			if (cflags & 1L<<i) {
+				bresp(clrin[n], inpRGB[i]);
+				copycolor(clrout[n], mbRGB[i]);
+				n++;
+			}
+		compsoln(clrin, clrout, n);
+		if (irrad > 0.99 && irrad < 1.01)	/* check gamut */
+			for (i = 0; i < 24; i++)
+				if (cflags & 1L<<i && cvtcolor(ctmp, mbRGB[i]))
+					gmtflags |= 1L<<i;
+	} while (cflags & gmtflags);
+	if (gmtflags & MODFLGS)
+		fprintf(stderr,
+		"%s: warning - some moderate colors are out of gamut\n",
+				progname);
 }
 
 
-putmapping()			/* put out color mapping for pcomb -f */
+putmapping()			/* put out color mapping */
 {
 	static char	cchar[3] = {'r', 'g', 'b'};
 	register int	i, j;
@@ -291,14 +496,13 @@ putmapping()			/* put out color mapping for pcomb -f *
 		for (i = 0; i < NMBNEU; i++)
 			printf(",%g", colval(bramp[i][1],j));
 		printf(");\n");
-		printf("%c = %ci(1);\n", cchar[j], cchar[j]);
 		printf("%cfi(n) = if(n-%g, %d, if(%cxa(n+1)-%c, n, %cfi(n+1)));\n",
 				cchar[j], NMBNEU-1.5, NMBNEU-1, cchar[j],
 				cchar[j], cchar[j]);
 		printf("%cndx = %cfi(1);\n", cchar[j], cchar[j]);
-		printf("%cn = ((%cxa(%cndx+1)-%c)*%cya(%cndx) + ",
-				cchar[j], cchar[j], cchar[j],
-				cchar[j], cchar[j], cchar[j]);
+		printf("%c%c = ((%cxa(%cndx+1)-%c)*%cya(%cndx) + ",
+				cchar[j], scanning?'n':'o', cchar[j],
+				cchar[j], cchar[j], cchar[j], cchar[j]);
 		printf("(%c-%cxa(%cndx))*%cya(%cndx+1)) /\n",
 				cchar[j], cchar[j], cchar[j],
 				cchar[j], cchar[j]);
@@ -306,17 +510,27 @@ putmapping()			/* put out color mapping for pcomb -f *
 				cchar[j], cchar[j], cchar[j], cchar[j]);
 	}
 					/* print color mapping */
-	printf("ro = %g*rn + %g*gn + %g*bn ;\n",
-			solmat[0][0], solmat[0][1], solmat[0][2]);
-	printf("go = %g*rn + %g*gn + %g*bn ;\n",
-			solmat[1][0], solmat[1][1], solmat[1][2]);
-	printf("bo = %g*rn + %g*gn + %g*bn ;\n",
-			solmat[2][0], solmat[2][1], solmat[2][2]);
+	if (scanning) {
+		printf("r = ri(1); g = gi(1); b = bi(1);\n");
+		printf("ro = %g*rn + %g*gn + %g*bn ;\n",
+				solmat[0][0], solmat[0][1], solmat[0][2]);
+		printf("go = %g*rn + %g*gn + %g*bn ;\n",
+				solmat[1][0], solmat[1][1], solmat[1][2]);
+		printf("bo = %g*rn + %g*gn + %g*bn ;\n",
+				solmat[2][0], solmat[2][1], solmat[2][2]);
+	} else {
+		printf("r1 = ri(1); g1 = gi(1); b1 = bi(1);\n");
+		printf("r = %g*r1 + %g*g1 + %g*b1 ;\n",
+				solmat[0][0], solmat[0][1], solmat[0][2]);
+		printf("g = %g*r1 + %g*g1 + %g*b1 ;\n",
+				solmat[1][0], solmat[1][1], solmat[1][2]);
+		printf("b = %g*r1 + %g*g1 + %g*b1 ;\n",
+				solmat[2][0], solmat[2][1], solmat[2][2]);
+	}
 }
 
 
-#if NMBMOD == 3
-compsoln(cin, cout, n)		/* solve 3x3 system */
+compsoln(cin, cout, n)		/* solve 3xN system using least-squares */
 COLOR	cin[], cout[];
 int	n;
 {
@@ -324,15 +538,28 @@ int	n;
 	double	mat[3][3], invmat[3][3];
 	double	det;
 	double	colv[3], rowv[3];
-	register int	i, j;
+	register int	i, j, k;
 
-	if (n != 3) {
-		fprintf(stderr, "%s: inconsistent code!\n", progname);
+	if (n < 3) {
+		fprintf(stderr, "%s: too few colors to match!\n", progname);
 		exit(1);
 	}
-	for (i = 0; i < 3; i++)
-		for (j = 0; j < 3; j++)
-			mat[i][j] = colval(cin[j],i);
+	if (n == 3)
+		for (i = 0; i < 3; i++)
+			for (j = 0; j < 3; j++)
+				mat[i][j] = colval(cin[j],i);
+	else {				/* compute A^t A */
+		for (i = 0; i < 3; i++)
+			for (j = i; j < 3; j++) {
+				mat[i][j] = 0.;
+				for (k = 0; k < n; k++)
+					mat[i][j] += colval(cin[k],i) *
+							colval(cin[k],j);
+			}
+		for (i = 1; i < 3; i++)		/* using symmetry */
+			for (j = 0; j < i; j++)
+				mat[i][j] = mat[j][i];
+	}
 	det = mx3d_adjoint(mat, invmat);
 	if (fabs(det) < 1e-4) {
 		fprintf(stderr, "%s: cannot compute color mapping\n",
@@ -346,87 +573,92 @@ int	n;
 		for (j = 0; j < 3; j++)
 			invmat[i][j] /= det;
 	for (i = 0; i < 3; i++) {
-		for (j = 0; j < 3; j++)
-			colv[j] = colval(cout[j],i);
+		if (n == 3)
+			for (j = 0; j < 3; j++)
+				colv[j] = colval(cout[j],i);
+		else
+			for (j = 0; j < 3; j++) {
+				colv[j] = 0.;
+				for (k = 0; k < n; k++)
+					colv[j] += colval(cout[k],i) *
+							colval(cin[k],j);
+			}
 		mx3d_transform(colv, invmat, rowv);
 		for (j = 0; j < 3; j++)
 			solmat[i][j] = rowv[j];
 	}
 }
-#else
-compsoln(cin, cout, n)		/* solve 3xN system (N > 3) */
-COLOR	cin[], cout[];
-int	n;
+
+
+cwarp()				/* compute color warp map */
 {
-	double	*au[NMBMOD], *v[3], vv[3][3], auv[NMBMOD][3], w[3];
-	double	b[NMBMOD];
-	register int	i, j;
+	register int	i;
 
-	if (n > NMBMOD) {
-		fprintf(stderr, "%s: inconsistent code!\n", progname);
-		exit(1);
-	}
-	for (i = 0; i < n; i++)		/* assign rectangular matrix A */
-		for (j = 0; j < 3; j++)
-			auv[i][j] = colval(cin[i],j);
-				/* svdcmp indexing requires pointer offsets */
-	for (j = 0; j < 3; j++)
-		v[j] = vv[j] - 1;
-	for (i = 0; i < n; i++)
-		au[i] = auv[i] - 1;
-				/* compute singular value decomposition */
-fprintf(stderr, "A:\n");
-for (i = 1; i <= n; i++)
-fprintf(stderr, "%g %g %g\n", (au-1)[i][1], (au-1)[i][2], (au-1)[i][3]);
-	svdcmp(au-1, n, 3, w-1, v-1);
-fprintf(stderr, "U:\n");
-for (i = 0; i < n; i++)
-fprintf(stderr, "%g %g %g\n", auv[i][0], auv[i][1], auv[i][2]);
-fprintf(stderr, "V:\n");
-for (i = 0; i < 3; i++)
-fprintf(stderr, "%g %g %g\n", vv[i][0], vv[i][1], vv[i][2]);
-fprintf(stderr, "W: %g %g %g\n", w[0], w[1], w[2]);
-				/* zero out small weights */
-	for (j = 0; j < 3; j++)
-		if (w[j] < 1e-4)
-			w[j] = 0.;
-				/* back substitution for each row vector */
-	for (j = 0; j < 3; j++) {
-		for (i = 0; i < n; i++)
-			b[i] = colval(cout[i],j);
-		svbksb(au-1, w-1, v-1, n, 3, b-1, solmat[j]-1);
-	}
+	if ((wcor = new3dw(W3EXACT)) == NULL)
+		goto memerr;
+	for (i = 0; i < 24; i++)
+		if (!add3dpt(wcor, inpRGB[i], mbRGB[i]))
+			goto memerr;
+	return;
+memerr:
+	perror(progname);
+	exit(1);
 }
-#endif
 
 
+int
 cvtcolor(cout, cin)		/* convert color according to our mapping */
 COLOR	cout, cin;
 {
-	double	r, g, b;
+	COLOR	ctmp;
+	int	clipped;
 
-	bresp(cout, cin);
-	r = colval(cout,0)*solmat[0][0] + colval(cout,1)*solmat[0][1]
-			+ colval(cout,2)*solmat[0][2];
-	if (r < 0) r = 0;
-	g = colval(cout,0)*solmat[1][0] + colval(cout,1)*solmat[1][1]
-			+ colval(cout,2)*solmat[1][2];
-	if (g < 0) g = 0;
-	b = colval(cout,0)*solmat[2][0] + colval(cout,1)*solmat[2][1]
-			+ colval(cout,2)*solmat[2][2];
-	if (b < 0) b = 0;
-	setcolor(cout, r, g, b);
+	if (wcor != NULL) {
+		clipped = warp3d(cout, cin, wcor);
+		clipped |= clipgamut(cout,bright(cout),CGAMUT,colmin,colmax);
+	} else if (scanning) {
+		bresp(ctmp, cin);
+		clipped = cresp(cout, ctmp);
+	} else {
+		clipped = cresp(ctmp, cin);
+		bresp(cout, ctmp);
+	}
+	return(clipped);
 }
 
 
-putdebug()			/* put out debugging picture */
+int
+cresp(cout, cin)		/* transform color according to matrix */
+COLOR	cout, cin;
 {
+	colortrans(cout, solmat, cin);
+	return(clipgamut(cout, bright(cout), CGAMUT, colmin, colmax));
+}
+
+
+xyY2RGB(rgbout, xyYin)		/* convert xyY to RGB */
+COLOR	rgbout;
+register float	xyYin[3];
+{
+	COLOR	ctmp;
+	double	d;
+
+	d = xyYin[2] / xyYin[1];
+	ctmp[0] = xyYin[0] * d;
+	ctmp[1] = xyYin[2];
+	ctmp[2] = (1. - xyYin[0] - xyYin[1]) * d;
+				/* allow negative values */
+	colortrans(rgbout, xyz2rgbmat, ctmp);
+}
+
+
+picdebug()			/* put out debugging picture */
+{
+	static COLOR	blkcol = BLKCOLOR;
 	COLOR	*scan;
-	int	y;
-	register int	x, i;
+	int	y, i;
+	register int	x, rg;
 
-	if (debugfp == NULL)
-		return;
 	if (fseek(stdin, 0L, 0) == EOF) {
 		fprintf(stderr, "%s: cannot seek on input picture\n", progname);
 		exit(1);
@@ -440,8 +672,10 @@ putdebug()			/* put out debugging picture */
 		exit(1);
 	}
 						/* finish debug header */
+	fputformat(COLRFMT, debugfp);
 	putc('\n', debugfp);
 	fprtresolu(xmax, ymax, debugfp);
+						/* write debug picture */
 	for (y = ymax-1; y >= 0; y--) {
 		if (freadscan(scan, xmax, stdin) < 0) {
 			fprintf(stderr, "%s: error rereading input picture\n",
@@ -449,11 +683,18 @@ putdebug()			/* put out debugging picture */
 			exit(1);
 		}
 		for (x = 0; x < xmax; x++) {
-			i = chartndx(x, y);
-			if (i < 0)
+			rg = chartndx(x, y, &i);
+			if (rg == RG_CENT) {
+				if (!(1L<<i & gmtflags) || (x+y)&07) {
+					copycolor(scan[x], mbRGB[i]);
+					clipgamut(scan[x], bright(scan[x]),
+						CGAMUT, colmin, colmax);
+				} else
+					copycolor(scan[x], blkcol);
+			} else if (rg == RG_CORR)
 				cvtcolor(scan[x], scan[x]);
-			else
-				copycolor(scan[x], mbRGB[i]);
+			else if (rg != RG_ORIG)
+				copycolor(scan[x], blkcol);
 		}
 		if (fwritescan(scan, xmax, debugfp) < 0) {
 			fprintf(stderr, "%s: error writing debugging picture\n",
@@ -461,5 +702,115 @@ putdebug()			/* put out debugging picture */
 			exit(1);
 		}
 	}
-	free((char *)scan);
+						/* clean up */
+	fclose(debugfp);
+	free((void *)scan);
+}
+
+
+clrdebug()			/* put out debug picture from color input */
+{
+	static COLR	blkclr = BLKCOLR;
+	COLR	mbclr[24], cvclr[24], orclr[24];
+	COLR	*scan;
+	COLOR	ctmp, ct2;
+	int	y, i;
+	register int	x, rg;
+						/* convert colors */
+	for (i = 0; i < 24; i++) {
+		copycolor(ctmp, mbRGB[i]);
+		clipgamut(ctmp, bright(ctmp), CGAMUT, cblack, cwhite);
+		setcolr(mbclr[i], colval(ctmp,RED),
+				colval(ctmp,GRN), colval(ctmp,BLU));
+		if (inpflags & 1L<<i) {
+			copycolor(ctmp, inpRGB[i]);
+			clipgamut(ctmp, bright(ctmp), CGAMUT, cblack, cwhite);
+			setcolr(orclr[i], colval(ctmp,RED),
+					colval(ctmp,GRN), colval(ctmp,BLU));
+			if (rawmap)
+				copycolr(cvclr[i], mbclr[i]);
+			else {
+				bresp(ctmp, inpRGB[i]);
+				colortrans(ct2, solmat, ctmp);
+				clipgamut(ct2, bright(ct2), CGAMUT,
+						cblack, cwhite);
+				setcolr(cvclr[i], colval(ct2,RED),
+						colval(ct2,GRN),
+						colval(ct2,BLU));
+			}
+		}
+	}
+						/* allocate scanline */
+	scan = (COLR *)malloc(xmax*sizeof(COLR));
+	if (scan == NULL) {
+		perror(progname);
+		exit(1);
+	}
+						/* finish debug header */
+	fputformat(COLRFMT, debugfp);
+	putc('\n', debugfp);
+	fprtresolu(xmax, ymax, debugfp);
+						/* write debug picture */
+	for (y = ymax-1; y >= 0; y--) {
+		for (x = 0; x < xmax; x++) {
+			rg = chartndx(x, y, &i);
+			if (rg == RG_CENT) {
+				if (!(1L<<i & gmtflags) || (x+y)&07)
+					copycolr(scan[x], mbclr[i]);
+				else
+					copycolr(scan[x], blkclr);
+			} else if (rg == RG_BORD || !(1L<<i & inpflags))
+				copycolr(scan[x], blkclr);
+			else if (rg == RG_ORIG)
+				copycolr(scan[x], orclr[i]);
+			else /* rg == RG_CORR */
+				copycolr(scan[x], cvclr[i]);
+		}
+		if (fwritecolrs(scan, xmax, debugfp) < 0) {
+			fprintf(stderr, "%s: error writing debugging picture\n",
+					progname);
+			exit(1);
+		}
+	}
+						/* clean up */
+	fclose(debugfp);
+	free((void *)scan);
+}
+
+
+getpos(name, bnds, fp)		/* get boundary position */
+char	*name;
+int	bnds[2];
+FILE	*fp;
+{
+	char	buf[64];
+
+	fprintf(stderr, "\tSelect corner: %s\n", name);
+	if (fgets(buf, sizeof(buf), fp) == NULL ||
+			sscanf(buf, "%d %d", &bnds[0], &bnds[1]) != 2) {
+		fprintf(stderr, "%s: read error from display process\n",
+				progname);
+		exit(1);
+	}
+}
+
+
+pickchartpos(pfn)		/* display picture and pick chart location */
+char	*pfn;
+{
+	char	combuf[512];
+	FILE	*pfp;
+
+	sprintf(combuf, DISPCOM, pfn);
+	if ((pfp = popen(combuf, "r")) == NULL) {
+		perror(combuf);
+		exit(1);
+	}
+	fputs("Use middle mouse button to select chart corners:\n", stderr);
+	getpos("upper left (dark skin)", bounds[0], pfp);
+	getpos("upper right (bluish green)", bounds[1], pfp);
+	getpos("lower left (white)", bounds[2], pfp);
+	getpos("lower right (black)", bounds[3], pfp);
+	fputs("Got it -- quit display program.\n", stderr);
+	pclose(pfp);
 }