--- ray/src/px/macbethcal.c 1995/10/20 15:26:11 2.7 +++ ray/src/px/macbethcal.c 1997/01/31 15:56:17 2.13 @@ -1,4 +1,4 @@ -/* Copyright (c) 1995 Regents of the University of California */ +/* Copyright (c) 1997 Regents of the University of California */ #ifndef lint static char SCCSid[] = "$SunId$ LBL"; @@ -77,34 +77,37 @@ COLOR mbRGB[24]; /* MacBeth RGB values */ #define NMBNEU 6 /* Number of MacBeth neutral colors */ short mbneu[NMBNEU] = {Black,Neutral35,Neutral5,Neutral65,Neutral8,White}; -#define NMBMOD 16 /* Number of MacBeth unsaturated colors */ -short mbmod[NMBMOD] = { - DarkSkin,LightSkin,BlueSky,Foliage,BlueFlower,BluishGreen, - PurplishBlue,ModerateRed,YellowGreen,OrangeYellow, - Black,Neutral35,Neutral5,Neutral65,Neutral8,White - }; +#define NEUFLGS (1L< 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 (inpispic) + if (scanning) picdebug(); else clrdebug(); @@ -235,14 +242,13 @@ init() /* initialize */ int -chartndx(x, y, cvg) /* find color number for position */ +chartndx(x, y, np) /* find color number for position */ int x, y; -double cvg; +int *np; { double ipos[3], cpos[3]; int ix, iy; double fx, fy; - double cmin, cmax; ipos[0] = x; ipos[1] = y; @@ -251,16 +257,19 @@ double cvg; 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; - cmin = .5*(1.-cvg); - cmax = 1. - cmin; - if (fx < cmin || fx >= cmax || fy < cmin || fy >= cmax) - 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 */ } @@ -270,8 +279,8 @@ getpicture() /* load in picture colors */ 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) { @@ -288,14 +297,12 @@ getpicture() /* load in picture colors */ progname); exit(1); } - for (x = 0; x < xmax; x++) { - i = chartndx(x, y, CENTCVG); - if (i >= 0) { + for (x = 0; x < xmax; x++) + if (chartndx(x, y, &i) == RG_CENT) { colr_color(pval, scanln[x]); addcolor(inpRGB[i], pval); ccount[i]++; } - } } for (i = 0; i < 24; i++) { /* compute averages */ if (ccount[i] == 0) @@ -320,8 +327,8 @@ getcolors() /* get xyY colors from standard input */ fgetval(stdin, 'f', &xyYin[0]) != 1 || fgetval(stdin, 'f', &xyYin[1]) != 1 || fgetval(stdin, 'f', &xyYin[2]) != 1 || - xyYin[0] < 0. | xyYin[0] > 1. | - xyYin[1] < 0. | xyYin[1] > 1.) { + xyYin[0] < 0. | xyYin[1] < 0. || + xyYin[0] + xyYin[1] > 1.) { fprintf(stderr, "%s: bad color input data\n", progname); exit(1); @@ -359,27 +366,26 @@ getcolors() /* get xyY colors from standard input */ bresp(y, x) /* piecewise linear interpolation of primaries */ COLOR y, x; { - double cv[3]; register int i, n; for (i = 0; i < 3; i++) { for (n = 0; n < NMBNEU-2; n++) if (colval(x,i) < colval(bramp[n+1][0],i)) break; - cv[i] = ((colval(bramp[n+1][0],i) - colval(x,i)) * + 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; register int i, n; /* did we get what we need? */ if ((inpflags & REQFLGS) != REQFLGS) { @@ -392,14 +398,43 @@ compute() /* compute color mapping */ copycolor(bramp[i][0], inpRGB[mbneu[i]]); copycolor(bramp[i][1], mbRGB[mbneu[i]]); } - /* compute color matrix */ - for (n = 0, i = 0; i < NMBMOD; i++) - if (inpflags & 1L< NMBMOD) { - fprintf(stderr, "%s: bad number of colors to match\n", progname); + if (n < 3) { + fprintf(stderr, "%s: too few colors to match!\n", progname); exit(1); } if (n == 3) @@ -501,25 +546,33 @@ int n; } +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 (scanning) { + bresp(ctmp, cin); + clipped = cresp(cout, ctmp); + } else { + clipped = cresp(ctmp, cin); + bresp(cout, ctmp); + } + return(clipped); } +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]; @@ -531,15 +584,17 @@ register float xyYin[3]; ctmp[0] = xyYin[0] * d; ctmp[1] = xyYin[2]; ctmp[2] = (1. - xyYin[0] - xyYin[1]) * d; - cie_rgb(rgbout, ctmp); + /* 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 (fseek(stdin, 0L, 0) == EOF) { fprintf(stderr, "%s: cannot seek on input picture\n", progname); @@ -565,11 +620,18 @@ picdebug() /* put out debugging picture */ exit(1); } for (x = 0; x < xmax; x++) { - i = chartndx(x, y, CENTCVG); - if (i < 0) + rg = chartndx(x, y, &i); + if (rg == RG_CENT) { + if (!(1L<= 0; y--) { - for (x = 0; x < xmax; x++) - if ((i = chartndx(x, y, CENTCVG)) >= 0) - copycolr(scan[x], mbclr[i]); - else if ((i = chartndx(x, y, FULLCVG)) >= 0 && - inpflags & 1L<