Used synchronise script to update files

1 files changed, 286 insertions, 286 deletions

diff --git a/libX11/src/xcms/CCC.c b/libX11/src/xcms/CCC.c
index 090b1078c..d0b055b7a 100644
--- a/libX11/src/xcms/CCC.c
+++ b/libX11/src/xcms/CCC.c
@@ -1,286 +1,286 @@
-
-/*
- * 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
- *		XcmsCCC.c - Color Conversion Context Routines
- *
- *	DESCRIPTION
- *		Routines to create, access, and free Color Conversion
- *		Context structures.
- *
- *
- */
-
-/*
-
-Copyright 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <stdio.h>
-#include "Xlibint.h"
-#include "Xcmsint.h"
-#include "Cv.h"
-
-
-
-/************************************************************************
- *									*
- *			PUBLIC INTERFACES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsCreateCCC
- *
- *	SYNOPSIS
- */
-
-XcmsCCC
-XcmsCreateCCC(
-    Display *dpy,
-    int screenNumber,
-    Visual *visual,
-    XcmsColor *clientWhitePt,
-    XcmsCompressionProc gamutCompProc,
-    XPointer gamutCompClientData,
-    XcmsWhiteAdjustProc whitePtAdjProc,
-    XPointer whitePtAdjClientData)
-/*
- *	DESCRIPTION
- *		Given a Display, Screen, Visual, etc., this routine creates
- *		an appropriate Color Conversion Context.
- *
- *	RETURNS
- *		Returns NULL if failed; otherwise address of the newly
- *		created XcmsCCC.
- *
- */
-{
-    XcmsCCC pDefaultCCC = XcmsDefaultCCC(dpy, screenNumber);
-    XcmsCCC newccc;
-    XcmsIntensityMap *pIMap;
-    XcmsPerScrnInfo *pNewScrnInfo;
-
-    if (pDefaultCCC == NULL ||
-	    !(newccc = (XcmsCCC) Xcalloc(1, (unsigned) sizeof(XcmsCCCRec)))) {
-	return(NULL);
-    }
-
-    /*
-     * Should inherit the following as result of a memmove():
-     *		dpy
-     *		screenNumber
-     *		pPerScrnInfo
-     */
-    memcpy((char *)newccc, (char *)pDefaultCCC, sizeof(XcmsCCCRec));
-    if (clientWhitePt) {
-	memcpy((char *)&newccc->clientWhitePt, (char *)clientWhitePt,
-		sizeof(XcmsColor));
-    }
-    if (gamutCompProc) {
-	newccc->gamutCompProc = gamutCompProc;
-    }
-    if (gamutCompClientData) {
-	newccc->gamutCompClientData = gamutCompClientData;
-    }
-    if (whitePtAdjProc) {
-	newccc->whitePtAdjProc = whitePtAdjProc;
-    }
-    if (whitePtAdjClientData) {
-	newccc->whitePtAdjClientData = whitePtAdjClientData;
-    }
-
-    /*
-     * Now check our list of per-Visual Intensity tables.
-     * If one exists replace the pPerScrnInfo.
-     */
-    if ((pIMap = _XcmsGetIntensityMap(dpy, visual)) != NULL) {
-	if (!(pNewScrnInfo = (XcmsPerScrnInfo *)
-		Xcalloc(1, (unsigned) sizeof(XcmsPerScrnInfo)))) {
-	    Xfree(newccc);
-	    return(NULL);
-	}
-	memcpy((char *)pNewScrnInfo, (char *)newccc->pPerScrnInfo,
-		sizeof(XcmsPerScrnInfo));
-	pNewScrnInfo->screenData = pIMap->screenData;
-	newccc->pPerScrnInfo = pNewScrnInfo;
-    }
-
-    /*
-     * Set visual component
-     */
-    newccc->visual = visual;
-
-    return(newccc);
-}
-
-
-/*
- *	NAME
- *		XcmsDefaultCCC
- *
- *	SYNOPSIS
- */
-XcmsCCC
-XcmsDefaultCCC(
-    Display *dpy,
-    int screenNumber)
-/*
- *	DESCRIPTION
- *		Given a Display and Screen, this routine creates
- *		returns the Screen's default Color Conversion Context.
- *		Note that a Screen's default CCC is built with the
- *		screen default visual.
- *
- *	RETURNS
- *		Returns NULL if failed; otherwise address of the
- *		XcmsCCC for the Screen's default CCC.
- *
- */
-{
-    XcmsCCC ccc;
-
-
-    if ((screenNumber < 0) || (screenNumber >= ScreenCount(dpy))) {
-	return((XcmsCCC)NULL);
-    }
-
-    /*
-     * Check if the XcmsCCC's for each screen has been created
-     */
-    if ((XcmsCCC)dpy->cms.defaultCCCs == NULL) {
-	if (!_XcmsInitDefaultCCCs(dpy)) {
-	    return((XcmsCCC)NULL);
-	}
-    }
-
-    ccc = (XcmsCCC)dpy->cms.defaultCCCs + screenNumber;
-
-    if (!ccc->pPerScrnInfo) {
-	/*
-	 * Need to create the XcmsPerScrnInfo structure.  The
-	 * _XcmsInitScrnInfo routine will create the XcmsPerScrnInfo
-	 * structure as well as initialize its functionSet and pScreenData
-	 * components.
-	 */
-	if (!_XcmsInitScrnInfo(dpy, screenNumber)) {
-	    return((XcmsCCC)NULL);
-	}
-	return(ccc);
-    } else {
-	/*
-	 * If ccc->pPerScrnInfo->state == XcmsInitSuccess,
-	 *    then the pPerScrnInfo component has already been initialized
-	 *    therefore, just return ccc.
-	 * If ccc->pPerScrnInfo->state == XcmsInitFailure,
-	 *    then this means that we already attempted to initialize
-	 *    the pPerScrnInfo component but failed therefore stuffing
-	 *    the pPerScrnInfo component with defaults.  Just return ccc.
-	 * If ccc->pPerScrnInfo->state == XcmsInitNone,
-	 *    then attempt to initialize the pPerScrnInfo component.
-	 */
-	switch (ccc->pPerScrnInfo->state) {
-	   case XcmsInitFailure :
-	    /* fall through */
-	   case XcmsInitSuccess :
-	    return(ccc);
-	   case XcmsInitNone :
-	    /* XcmsPerScreenInfo has not been initialized */
-	    if (!_XcmsInitScrnInfo(dpy, screenNumber)) {
-		return((XcmsCCC)NULL);
-	    }
-	    return(ccc);
-	   default :
-	    return((XcmsCCC)NULL);
-	}
-    }
-}
-
-
-/*
- *	NAME
- *		XcmsFreeCCC
- *
- *	SYNOPSIS
- */
-void
-XcmsFreeCCC(XcmsCCC ccc)
-/*
- *	DESCRIPTION
- *		Frees memory associated with a Color Conversion Context
- *		that was created with XcmsCreateCCC().
- *
- *	RETURNS
- *		void
- *
- */
-{
-    if (ccc->dpy->cms.defaultCCCs &&
-	ccc == ((XcmsCCC)ccc->dpy->cms.defaultCCCs) + ccc->screenNumber) {
-	/* do not allow clients to free DefaultCCC's */
-	return;
-    }
-
-    /*
-     * Note that XcmsPerScrnInfo sub-structures are freed here only if
-     * they are for visuals that have per-Visual intensity tables.
-     * Otherwise the XcmsPerScrnInfo structure is being shared!
-     * For the latter, there is only one allocated per Screen and it just
-     * so happens * that we place its initial reference is placed in the
-     * 	default CCC.  The routine _XcmsFreeDefaultCCCs frees them.
-     */
-    if (_XcmsGetIntensityMap(ccc->dpy, ccc->visual) != NULL) {
-	Xfree(ccc->pPerScrnInfo);
-    }
-
-    Xfree(ccc);
-}
+

+/*

+ * 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

+ *		XcmsCCC.c - Color Conversion Context Routines

+ *

+ *	DESCRIPTION

+ *		Routines to create, access, and free Color Conversion

+ *		Context structures.

+ *

+ *

+ */

+

+/*

+

+Copyright 1994, 1998  The Open Group

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation.

+

+The above copyright notice and this permission notice shall be included

+in all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall

+not be used in advertising or otherwise to promote the sale, use or

+other dealings in this Software without prior written authorization

+from The Open Group.

+

+*/

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include <stdio.h>

+#include "Xlibint.h"

+#include "Xcmsint.h"

+#include "Cv.h"

+

+

+

+/************************************************************************

+ *									*

+ *			PUBLIC INTERFACES				*

+ *									*

+ ************************************************************************/

+

+/*

+ *	NAME

+ *		XcmsCreateCCC

+ *

+ *	SYNOPSIS

+ */

+

+XcmsCCC

+XcmsCreateCCC(

+    Display *dpy,

+    int screenNumber,

+    Visual *visual,

+    XcmsColor *clientWhitePt,

+    XcmsCompressionProc gamutCompProc,

+    XPointer gamutCompClientData,

+    XcmsWhiteAdjustProc whitePtAdjProc,

+    XPointer whitePtAdjClientData)

+/*

+ *	DESCRIPTION

+ *		Given a Display, Screen, Visual, etc., this routine creates

+ *		an appropriate Color Conversion Context.

+ *

+ *	RETURNS

+ *		Returns NULL if failed; otherwise address of the newly

+ *		created XcmsCCC.

+ *

+ */

+{

+    XcmsCCC pDefaultCCC = XcmsDefaultCCC(dpy, screenNumber);

+    XcmsCCC newccc;

+    XcmsIntensityMap *pIMap;

+    XcmsPerScrnInfo *pNewScrnInfo;

+

+    if (pDefaultCCC == NULL ||

+	    !(newccc = (XcmsCCC) Xcalloc(1, (unsigned) sizeof(XcmsCCCRec)))) {

+	return(NULL);

+    }

+

+    /*

+     * Should inherit the following as result of a memmove():

+     *		dpy

+     *		screenNumber

+     *		pPerScrnInfo

+     */

+    memcpy((char *)newccc, (char *)pDefaultCCC, sizeof(XcmsCCCRec));

+    if (clientWhitePt) {

+	memcpy((char *)&newccc->clientWhitePt, (char *)clientWhitePt,

+		sizeof(XcmsColor));

+    }

+    if (gamutCompProc) {

+	newccc->gamutCompProc = gamutCompProc;

+    }

+    if (gamutCompClientData) {

+	newccc->gamutCompClientData = gamutCompClientData;

+    }

+    if (whitePtAdjProc) {

+	newccc->whitePtAdjProc = whitePtAdjProc;

+    }

+    if (whitePtAdjClientData) {

+	newccc->whitePtAdjClientData = whitePtAdjClientData;

+    }

+

+    /*

+     * Now check our list of per-Visual Intensity tables.

+     * If one exists replace the pPerScrnInfo.

+     */

+    if ((pIMap = _XcmsGetIntensityMap(dpy, visual)) != NULL) {

+	if (!(pNewScrnInfo = (XcmsPerScrnInfo *)

+		Xcalloc(1, (unsigned) sizeof(XcmsPerScrnInfo)))) {

+	    Xfree(newccc);

+	    return(NULL);

+	}

+	memcpy((char *)pNewScrnInfo, (char *)newccc->pPerScrnInfo,

+		sizeof(XcmsPerScrnInfo));

+	pNewScrnInfo->screenData = pIMap->screenData;

+	newccc->pPerScrnInfo = pNewScrnInfo;

+    }

+

+    /*

+     * Set visual component

+     */

+    newccc->visual = visual;

+

+    return(newccc);

+}

+

+

+/*

+ *	NAME

+ *		XcmsDefaultCCC

+ *

+ *	SYNOPSIS

+ */

+XcmsCCC

+XcmsDefaultCCC(

+    Display *dpy,

+    int screenNumber)

+/*

+ *	DESCRIPTION

+ *		Given a Display and Screen, this routine creates

+ *		returns the Screen's default Color Conversion Context.

+ *		Note that a Screen's default CCC is built with the

+ *		screen default visual.

+ *

+ *	RETURNS

+ *		Returns NULL if failed; otherwise address of the

+ *		XcmsCCC for the Screen's default CCC.

+ *

+ */

+{

+    XcmsCCC ccc;

+

+

+    if ((screenNumber < 0) || (screenNumber >= ScreenCount(dpy))) {

+	return((XcmsCCC)NULL);

+    }

+

+    /*

+     * Check if the XcmsCCC's for each screen has been created

+     */

+    if ((XcmsCCC)dpy->cms.defaultCCCs == NULL) {

+	if (!_XcmsInitDefaultCCCs(dpy)) {

+	    return((XcmsCCC)NULL);

+	}

+    }

+

+    ccc = (XcmsCCC)dpy->cms.defaultCCCs + screenNumber;

+

+    if (!ccc->pPerScrnInfo) {

+	/*

+	 * Need to create the XcmsPerScrnInfo structure.  The

+	 * _XcmsInitScrnInfo routine will create the XcmsPerScrnInfo

+	 * structure as well as initialize its functionSet and pScreenData

+	 * components.

+	 */

+	if (!_XcmsInitScrnInfo(dpy, screenNumber)) {

+	    return((XcmsCCC)NULL);

+	}

+	return(ccc);

+    } else {

+	/*

+	 * If ccc->pPerScrnInfo->state == XcmsInitSuccess,

+	 *    then the pPerScrnInfo component has already been initialized

+	 *    therefore, just return ccc.

+	 * If ccc->pPerScrnInfo->state == XcmsInitFailure,

+	 *    then this means that we already attempted to initialize

+	 *    the pPerScrnInfo component but failed therefore stuffing

+	 *    the pPerScrnInfo component with defaults.  Just return ccc.

+	 * If ccc->pPerScrnInfo->state == XcmsInitNone,

+	 *    then attempt to initialize the pPerScrnInfo component.

+	 */

+	switch (ccc->pPerScrnInfo->state) {

+	   case XcmsInitFailure :

+	    /* fall through */

+	   case XcmsInitSuccess :

+	    return(ccc);

+	   case XcmsInitNone :

+	    /* XcmsPerScreenInfo has not been initialized */

+	    if (!_XcmsInitScrnInfo(dpy, screenNumber)) {

+		return((XcmsCCC)NULL);

+	    }

+	    return(ccc);

+	   default :

+	    return((XcmsCCC)NULL);

+	}

+    }

+}

+

+

+/*

+ *	NAME

+ *		XcmsFreeCCC

+ *

+ *	SYNOPSIS

+ */

+void

+XcmsFreeCCC(XcmsCCC ccc)

+/*

+ *	DESCRIPTION

+ *		Frees memory associated with a Color Conversion Context

+ *		that was created with XcmsCreateCCC().

+ *

+ *	RETURNS

+ *		void

+ *

+ */

+{

+    if (ccc->dpy->cms.defaultCCCs &&

+	ccc == ((XcmsCCC)ccc->dpy->cms.defaultCCCs) + ccc->screenNumber) {

+	/* do not allow clients to free DefaultCCC's */

+	return;

+    }

+

+    /*

+     * Note that XcmsPerScrnInfo sub-structures are freed here only if

+     * they are for visuals that have per-Visual intensity tables.

+     * Otherwise the XcmsPerScrnInfo structure is being shared!

+     * For the latter, there is only one allocated per Screen and it just

+     * so happens * that we place its initial reference is placed in the

+     * 	default CCC.  The routine _XcmsFreeDefaultCCCs frees them.

+     */

+    if (_XcmsGetIntensityMap(ccc->dpy, ccc->visual) != NULL) {

+	Xfree(ccc->pPerScrnInfo);

+    }

+

+    Xfree(ccc);

+}