ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/px/macbethcal.c

Comparing ray/src/px/macbethcal.c (file contents):
Revision 2.8 by greg, Mon Oct 23 10:19:40 1995 UTC vs.
Revision 2.11 by greg, Thu Jan 30 17:07:42 1997 UTC

#	Line 90 | Line 90 | short  mbneu[NMBNEU] = {Black,Neutral35,Neutral5,Neutra
90		#define  REQFLGS        NEUFLGS                 /* need these colors */
91		#define  MODFLGS        (NEUFLGS|UNSFLGS)       /* should be in gamut */
92
93	<	#define  CENTCVG        0.3     /* measured coverage of square sample */
94	<	#define  FULLCVG        0.9     /* coverage of entire square */
93	>	#define  RG_BORD        0       /* patch border */
94	>	#define  RG_CENT        01      /* central region of patch */
95	>	#define  RG_ORIG        02      /* original color region */
96	>	#define  RG_CORR        04      /* corrected color region */
97
98	+	int     scanning = 1;           /* scanned input (or recorded output)? */
99	+
100		int     xmax, ymax;             /* input image dimensions */
101		int     bounds[4][2];           /* image coordinates of chart corners */
102		double  imgxfm[3][3];           /* coordinate transformation matrix */
#	Line 114 | Line 118 | main(argc, argv)
118		int     argc;
119		char    **argv;
120		{
117	–	int     inpispic = 1;
121		int     i;
122
123		progname = argv[0];
#	Line 145 | Line 148 | char   **argv;
148		bounds[2][1] = atoi(argv[++i]);
149		bounds[3][0] = atoi(argv[++i]);
150		bounds[3][1] = atoi(argv[++i]);
151	<	inpispic = 2;
151	>	scanning = 2;
152		break;
153		case 'c':                               /* color input */
154	<	inpispic = 0;
154	>	scanning = 0;
155		break;
156		default:
157		goto userr;
#	Line 162 | Line 165 | char   **argv;
165		perror(argv[2]);
166		exit(1);
167		}
168	<	if (inpispic) {                 /* load input picture header */
168	>	if (scanning) {                 /* load input picture header */
169		#ifdef MSDOS
170		setmode(fileno(stdin), O_BINARY);
171		#endif
#	Line 175 | Line 178 | char   **argv;
178		xmax = 512;
179		ymax = 2*512/3;
180		}
181	<	if (inpispic != 2) {            /* use default boundaries */
181	>	if (scanning != 2) {            /* use default boundaries */
182		bounds[0][0] = bounds[2][0] = .029*xmax + .5;
183		bounds[0][1] = bounds[1][1] = .956*ymax + .5;
184		bounds[1][0] = bounds[3][0] = .971*xmax + .5;
185		bounds[2][1] = bounds[3][1] = .056*ymax + .5;
186		}
187		init();                         /* initialize */
188	<	if (inpispic)                   /* get picture colors */
188	>	if (scanning)                   /* get picture colors */
189		getpicture();
190		else
191		getcolors();
192		compute();                      /* compute color mapping */
193		/* print comment */
194	<	printf("{ Color correction file computed by:\n\t");
194	>	printf("{\n\tColor correction file computed by:\n\t\t");
195		printargs(argc, argv, stdout);
196	+	printf("\n\tUsage: pcomb -f %s uncorrected.pic > corrected.pic\n",
197	+	i+1 < argc ? argv[i+1] : "{this_file}");
198	+	if (!scanning)
199	+	printf("\t   Or: pcond [options] -f %s orig.pic > output.pic\n",
200	+	i+1 < argc ? argv[i+1] : "{this_file}");
201		printf("}\n");
202		putmapping();                   /* put out color mapping */
203		if (debugfp != NULL)            /* put out debug picture */
204	<	if (inpispic)
204	>	if (scanning)
205		picdebug();
206		else
207		clrdebug();
#	Line 233 | Line 241 | init()                         /* initialize */
241
242
243		int
244	<	chartndx(x, y, cvg)                     /* find color number for position */
244	>	chartndx(x, y, np)                      /* find color number for position */
245		int     x, y;
246	<	double  cvg;
246	>	int     *np;
247		{
248		double  ipos[3], cpos[3];
249		int     ix, iy;
250		double  fx, fy;
243	–	double  cmin, cmax;
251
252		ipos[0] = x;
253		ipos[1] = y;
#	Line 249 | Line 256 | double cvg;
256		cpos[0] /= cpos[2];
257		cpos[1] /= cpos[2];
258		if (cpos[0] < 0. || cpos[0] >= 6. || cpos[1] < 0. || cpos[1] >= 4.)
259	<	return(-1);
259	>	return(RG_BORD);
260		ix = cpos[0];
261		iy = cpos[1];
262		fx = cpos[0] - ix;
263		fy = cpos[1] - iy;
264	<	cmin = .5*(1.-cvg);
265	<	cmax = 1. - cmin;
266	<	if (fx < cmin || fx >= cmax || fy < cmin || fy >= cmax)
267	<	return(-1);
268	<	return(iy*6 + ix);
264	>	*np = iy*6 + ix;
265	>	if (fx >= 0.35 && fx < 0.65 && fy >= 0.35 && fy < 0.65)
266	>	return(RG_CENT);
267	>	if (fx < 0.05 || fx >= 0.95 || fy < 0.05 || fy >= 0.95)
268	>	return(RG_BORD);
269	>	if (fx >= 0.5)                  /* right side is corrected */
270	>	return(RG_CORR);
271	>	return(RG_ORIG);                /* left side is original */
272		}
273
274
#	Line 268 | Line 278 | getpicture()                           /* load in picture colors */
278		COLOR   pval;
279		int     ccount[24];
280		double  d;
281	<	int     y;
282	<	register int    x, i;
281	>	int     y, i;
282	>	register int    x;
283
284		scanln = (COLR *)malloc(xmax*sizeof(COLR));
285		if (scanln == NULL) {
#	Line 286 | Line 296 | getpicture()                           /* load in picture colors */
296		progname);
297		exit(1);
298		}
299	<	for (x = 0; x < xmax; x++) {
300	<	i = chartndx(x, y, CENTCVG);
291	<	if (i >= 0) {
299	>	for (x = 0; x < xmax; x++)
300	>	if (chartndx(x, y, &i) == RG_CENT) {
301		colr_color(pval, scanln[x]);
302		addcolor(inpRGB[i], pval);
303		ccount[i]++;
304		}
296	–	}
305		}
306		for (i = 0; i < 24; i++) {              /* compute averages */
307		if (ccount[i] == 0)
#	Line 403 | Line 411 | compute()                      /* compute color mapping */
411		/* check out-of-gamut colors */
412		for (i = 0; i < 24; i++)
413		if (cflags & 1L<<i) {
414	<	cresp(ctmp, mbRGB[i]);
414	>	cvtcolor(ctmp, mbRGB[i]);
415		for (j = 0; j < 3; j++)
416	<	if (colval(ctmp,j) <= 0. ||
417	<	colval(ctmp,j) >= 1.) {
416	>	if (colval(ctmp,j) <= 1e-6 ||
417	>	colval(ctmp,j) >= 1.-1e-6) {
418		gmtflags |= 1L<<i;
419		break;
420		}
#	Line 433 | Line 441 | putmapping()                   /* put out color mapping for pcomb -f *
441		for (i = 0; i < NMBNEU; i++)
442		printf(",%g", colval(bramp[i][1],j));
443		printf(");\n");
436	–	printf("%c = %ci(1);\n", cchar[j], cchar[j]);
444		printf("%cfi(n) = if(n-%g, %d, if(%cxa(n+1)-%c, n, %cfi(n+1)));\n",
445		cchar[j], NMBNEU-1.5, NMBNEU-1, cchar[j],
446		cchar[j], cchar[j]);
447		printf("%cndx = %cfi(1);\n", cchar[j], cchar[j]);
448	<	printf("%cn = ((%cxa(%cndx+1)-%c)*%cya(%cndx) + ",
449	<	cchar[j], cchar[j], cchar[j],
450	<	cchar[j], cchar[j], cchar[j]);
448	>	printf("%c%c = ((%cxa(%cndx+1)-%c)*%cya(%cndx) + ",
449	>	cchar[j], scanning?'n':'o', cchar[j],
450	>	cchar[j], cchar[j], cchar[j], cchar[j]);
451		printf("(%c-%cxa(%cndx))*%cya(%cndx+1)) /\n",
452		cchar[j], cchar[j], cchar[j],
453		cchar[j], cchar[j]);
#	Line 448 | Line 455 | putmapping()                   /* put out color mapping for pcomb -f *
455		cchar[j], cchar[j], cchar[j], cchar[j]);
456		}
457		/* print color mapping */
458	<	printf("ro = %g*rn + %g*gn + %g*bn ;\n",
459	<	solmat[0][0], solmat[0][1], solmat[0][2]);
460	<	printf("go = %g*rn + %g*gn + %g*bn ;\n",
461	<	solmat[1][0], solmat[1][1], solmat[1][2]);
462	<	printf("bo = %g*rn + %g*gn + %g*bn ;\n",
463	<	solmat[2][0], solmat[2][1], solmat[2][2]);
458	>	if (scanning) {
459	>	printf("r = ri(1); g = gi(1); b = bi(1);\n");
460	>	printf("ro = %g*rn + %g*gn + %g*bn ;\n",
461	>	solmat[0][0], solmat[0][1], solmat[0][2]);
462	>	printf("go = %g*rn + %g*gn + %g*bn ;\n",
463	>	solmat[1][0], solmat[1][1], solmat[1][2]);
464	>	printf("bo = %g*rn + %g*gn + %g*bn ;\n",
465	>	solmat[2][0], solmat[2][1], solmat[2][2]);
466	>	} else {
467	>	printf("r1 = ri(1); g1 = gi(1); b1 = bi(1);\n");
468	>	printf("r = %g*r1 + %g*g1 + %g*b1 ;\n",
469	>	solmat[0][0], solmat[0][1], solmat[0][2]);
470	>	printf("g = %g*r1 + %g*g1 + %g*b1 ;\n",
471	>	solmat[1][0], solmat[1][1], solmat[1][2]);
472	>	printf("b = %g*r1 + %g*g1 + %g*b1 ;\n",
473	>	solmat[2][0], solmat[2][1], solmat[2][2]);
474	>	}
475		}
476
477
#	Line 522 | Line 540 | COLOR  cout, cin;
540		{
541		COLOR   ctmp;
542
543	<	bresp(ctmp, cin);
544	<	cresp(cout, ctmp);
543	>	if (scanning) {
544	>	bresp(ctmp, cin);
545	>	cresp(cout, ctmp);
546	>	} else {
547	>	cresp(ctmp, cin);
548	>	bresp(cout, ctmp);
549	>	}
550		if (colval(cout,RED) < 0.)
551		colval(cout,RED) = 0.;
552		if (colval(cout,GRN) < 0.)
#	Line 567 | Line 590 | picdebug()                     /* put out debugging picture */
590		{
591		static COLOR    blkcol = BLKCOLOR;
592		COLOR   *scan;
593	<	int     y;
594	<	register int    x, i;
593	>	int     y, i;
594	>	register int    x, rg;
595
596		if (fseek(stdin, 0L, 0) == EOF) {
597		fprintf(stderr, "%s: cannot seek on input picture\n", progname);
#	Line 594 | Line 617 | picdebug()                     /* put out debugging picture */
617		exit(1);
618		}
619		for (x = 0; x < xmax; x++) {
620	<	i = chartndx(x, y, CENTCVG);
621	<	if (i < 0)
620	>	rg = chartndx(x, y, &i);
621	>	if (rg == RG_CENT) {
622	>	if (!(1L<<i & gmtflags) || (x+y)&07)
623	>	copycolor(scan[x], mbRGB[i]);
624	>	else
625	>	copycolor(scan[x], blkcol);
626	>	} else if (rg == RG_CORR)
627		cvtcolor(scan[x], scan[x]);
628	<	else if (!(1L<<i & gmtflags) || (x+y)&07)
601	<	copycolor(scan[x], mbRGB[i]);
602	<	else
628	>	else if (rg != RG_ORIG)
629		copycolor(scan[x], blkcol);
630		}
631		if (fwritescan(scan, xmax, debugfp) < 0) {
#	Line 617 | Line 643 | picdebug()                     /* put out debugging picture */
643		clrdebug()                      /* put out debug picture from color input */
644		{
645		static COLR     blkclr = BLKCOLR;
646	<	COLR    mbclr[24], cvclr[24];
646	>	COLR    mbclr[24], cvclr[24], orclr[24];
647		COLR    *scan;
648		COLOR   ctmp;
649	<	int     y;
650	<	register int    i, x;
649	>	int     y, i;
650	>	register int    x, rg;
651		/* convert colors */
652		for (i = 0; i < 24; i++) {
653		setcolr(mbclr[i], colval(mbRGB[i],RED),
654		colval(mbRGB[i],GRN), colval(mbRGB[i],BLU));
655		if (inpflags & 1L<<i) {
656	+	setcolr(orclr[i], colval(inpRGB[i],RED),
657	+	colval(inpRGB[i],GRN),
658	+	colval(inpRGB[i],BLU));
659		cvtcolor(ctmp, inpRGB[i]);
660		setcolr(cvclr[i], colval(ctmp,RED),
661		colval(ctmp,GRN), colval(ctmp,BLU));
#	Line 644 | Line 673 | clrdebug()                     /* put out debug picture from color input
673		fprtresolu(xmax, ymax, debugfp);
674		/* write debug picture */
675		for (y = ymax-1; y >= 0; y--) {
676	<	for (x = 0; x < xmax; x++)
677	<	if ((i = chartndx(x, y, CENTCVG)) >= 0) {
676	>	for (x = 0; x < xmax; x++) {
677	>	rg = chartndx(x, y, &i);
678	>	if (rg == RG_CENT) {
679		if (!(1L<<i & gmtflags) || (x+y)&07)
680		copycolr(scan[x], mbclr[i]);
681		else
682		copycolr(scan[x], blkclr);
683	<	} else if ((i = chartndx(x, y, FULLCVG)) >= 0 &&
654	<	inpflags & 1L<<i)
655	<	copycolr(scan[x], cvclr[i]);
656	<	else
683	>	} else if (rg == RG_BORD || !(1L<<i & inpflags))
684		copycolr(scan[x], blkclr);
685	+	else if (rg == RG_ORIG)
686	+	copycolr(scan[x], orclr[i]);
687	+	else /* rg == RG_CORR */
688	+	copycolr(scan[x], cvclr[i]);
689	+	}
690		if (fwritecolrs(scan, xmax, debugfp) < 0) {
691		fprintf(stderr, "%s: error writing debugging picture\n",
692		progname);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)