Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

1 files changed, 205 insertions, 0 deletions

diff --git a/libX11/src/xcms/LabMxC.c b/libX11/src/xcms/LabMxC.c
new file mode 100644
index 000000000..acd83f2d5
--- /dev/null
+++ b/libX11/src/xcms/LabMxC.c
@@ -0,0 +1,205 @@
+/* $Xorg: LabMxC.c,v 1.3 2000/08/17 19:44:40 cpqbld Exp $ */
+
+/*
+ * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
+ * 	All Rights Reserved
+ * 
+ * This file is a component of an X Window System-specific implementation
+ * of XCMS based on the TekColor Color Management System.  Permission is
+ * hereby granted to use, copy, modify, sell, and otherwise distribute this
+ * software and its documentation for any purpose and without fee, provided
+ * that this copyright, permission, and disclaimer notice is reproduced in
+ * all copies of this software and in supporting documentation.  TekColor
+ * is a trademark of Tektronix, Inc.
+ * 
+ * Tektronix makes no representation about the suitability of this software
+ * for any purpose.  It is provided "as is" and with all faults.
+ * 
+ * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
+ * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
+ * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
+ *
+ *
+ *
+ *	NAME
+ *		CIELabMxC.c
+ *
+ *	DESCRIPTION
+ *		Source for the XcmsCIELabQueryMaxC() gamut boundary
+ *		querying routine.
+ *
+ */
+/* $XFree86: xc/lib/X11/LabMxC.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "Xlibint.h"
+#include "Xcmsint.h"
+#include <math.h>
+#include "Cv.h"
+
+/*
+ *	DEFINES
+ */
+#define MAXBISECTCOUNT	100
+#define EPS	        (XcmsFloat)0.001
+#define START_CHROMA	(XcmsFloat)3.6
+#define TOPL		(XcmsFloat)100.0
+
+
+/************************************************************************
+ *									*
+ *			 PUBLIC ROUTINES				*
+ *									*
+ ************************************************************************/
+
+/*
+ *	NAME
+ *		XcmsCIELabQueryMaxC - max chroma for a hue_angle and L_star
+ *
+ *	SYNOPSIS
+ */
+Status
+XcmsCIELabQueryMaxC(
+    XcmsCCC ccc,
+    XcmsFloat hue_angle,	    /* hue angle in degrees */
+    XcmsFloat L_star,
+    XcmsColor *pColor_return)
+/*
+ *	DESCRIPTION
+ *		Return the maximum chroma for a specific hue_angle and L_star.
+ *		The returned format is in XcmsCIELabFormat.
+ *
+ *
+ *	ASSUMPTIONS
+ *		This routine assumes that the white point associated with
+ *		the color specification is the Screen White Point.  The
+ *		Screen White Point will also be associated with the
+ *		returned color specification.
+ *
+ *	RETURNS
+ *		XcmsFailure - Failure
+ *              XcmsSuccess - Succeeded
+ *
+ */
+{
+    XcmsCCCRec	myCCC;
+    XcmsColor  tmp;
+    XcmsColor  max_lc;
+    XcmsFloat n_L_star, last_L_star, prev_L_star;
+    XcmsFloat hue, lastaStar, lastbStar, /*lastChroma,*/ maxDist, nT, rFactor;
+    XcmsRGBi   rgb_saved;
+    int nCount, nMaxCount;
+
+    /*
+     * Check Arguments
+     */
+    if (ccc == NULL || pColor_return == NULL) {
+	return(XcmsFailure);
+    }
+
+    /* Use my own CCC and inherit screen white Pt */
+    memcpy ((char *)&myCCC, (char *)ccc, sizeof(XcmsCCCRec));
+    myCCC.clientWhitePt.format = XcmsUndefinedFormat; 
+    myCCC.gamutCompProc = (XcmsCompressionProc)NULL;/* no gamut comp func */
+
+    while (hue_angle < 0.0) {
+	hue_angle += 360.0;
+    }
+    while (hue_angle >= 360.0) {
+	hue_angle -= 360.0;
+    } 
+
+    hue = radians(hue_angle);
+    tmp.spec.CIELab.L_star = L_star;
+    tmp.spec.CIELab.a_star = XCMS_CIEASTAROFHUE(hue, START_CHROMA);
+    tmp.spec.CIELab.b_star = XCMS_CIEBSTAROFHUE(hue, START_CHROMA);
+    tmp.pixel = pColor_return->pixel;
+    tmp.format = XcmsCIELabFormat;
+
+    /* Step 1: compute the maximum L_star and chroma for this hue. */
+    memcpy((char *)&max_lc, (char *)&tmp, sizeof(XcmsColor));
+    if (_XcmsCIELabQueryMaxLCRGB(&myCCC, hue, &max_lc, &rgb_saved)
+	== XcmsFailure) {
+	    return(XcmsFailure);
+    }
+
+    /*
+     * Step 2:  Do a bisection here to compute the maximum chroma
+     *          Note the differences between when the point to be found
+     *          is above the maximum LC point and when it is below.
+     */
+    if (L_star <= max_lc.spec.CIELab.L_star) {
+	maxDist = max_lc.spec.CIELab.L_star;
+    } else {
+	maxDist = TOPL - max_lc.spec.CIELab.L_star;
+    }
+
+    n_L_star = L_star;
+    last_L_star = -1.0;
+    nMaxCount = MAXBISECTCOUNT;
+    rFactor = 1.0;
+
+    for (nCount = 0; nCount < nMaxCount; nCount++) {
+	prev_L_star =  last_L_star;
+	last_L_star =  tmp.spec.CIELab.L_star;
+/*	lastChroma = XCMS_CIELAB_PMETRIC_CHROMA(tmp.spec.CIELab.a_star,  */
+/*						tmp.spec.CIELab.b_star); */
+	lastaStar = tmp.spec.CIELab.a_star;
+	lastbStar = tmp.spec.CIELab.b_star;
+	nT = (n_L_star - max_lc.spec.CIELab.L_star) / maxDist * rFactor;
+	if (nT > 0) {
+	    tmp.spec.RGBi.red = rgb_saved.red * (1.0 - nT) + nT;
+	    tmp.spec.RGBi.green = rgb_saved.green * (1.0 - nT) + nT;
+	    tmp.spec.RGBi.blue  = rgb_saved.blue * (1.0 - nT) + nT;
+	} else {
+	    tmp.spec.RGBi.red = rgb_saved.red + (rgb_saved.red * nT);
+	    tmp.spec.RGBi.green = rgb_saved.green + (rgb_saved.green * nT);
+	    tmp.spec.RGBi.blue = rgb_saved.blue + (rgb_saved.blue * nT);
+	}
+	tmp.format = XcmsRGBiFormat;
+
+	/* convert from RGB to CIELab */
+	if (_XcmsConvertColorsWithWhitePt(&myCCC, &tmp,
+			    ScreenWhitePointOfCCC(&myCCC), 1, XcmsCIELabFormat,
+			    (Bool *) NULL) == XcmsFailure) {
+	    return(XcmsFailure);
+	}
+
+	/*
+	 * Now check if we've reached the target L_star
+	 */
+	/* printf("result Lstar = %lf\n", tmp.spec.CIELab.L_star); */
+	if (tmp.spec.CIELab.L_star <= L_star + EPS &&
+	    tmp.spec.CIELab.L_star >= L_star - EPS) {
+		memcpy((char *)pColor_return, (char *)&tmp, sizeof(XcmsColor));
+		return(XcmsSuccess);
+	}
+	if (nT > 0) {
+	    n_L_star += ((TOPL - n_L_star) *
+			 (L_star - tmp.spec.CIELab.L_star)) / (TOPL - L_star);
+	} else {
+	    n_L_star *= L_star / tmp.spec.CIELuv.L_star;
+	}
+	if (tmp.spec.CIELab.L_star <= prev_L_star + EPS &&
+	    tmp.spec.CIELab.L_star >= prev_L_star - EPS) {
+		rFactor *= 0.5;  /* selective relaxation employed */
+		/* printf("rFactor = %lf\n", rFactor); */
+	}
+    }
+    if (XCMS_FABS(last_L_star - L_star) < 
+	XCMS_FABS(tmp.spec.CIELab.L_star - L_star)) {
+	    tmp.spec.CIELab.a_star = lastaStar;
+	    tmp.spec.CIELab.b_star = lastbStar;
+/*	    tmp.spec.CIELab.a_star = XCMS_CIEASTAROFHUE(hue, lastChroma); */
+/*	    tmp.spec.CIELab.b_star = XCMS_CIEBSTAROFHUE(hue, lastChroma); */
+    }
+    tmp.spec.CIELab.L_star = L_star;
+    memcpy((char *)pColor_return, (char *)&tmp, sizeof(XcmsColor));
+    return(XcmsSuccess);
+}