diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 12:38:10 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 12:38:10 +0000 |
| commit | c87efef42f76c2ff0dcfad2842ab369beffd21de (patch) | |
| tree | 0ded972bd95879c77ed8fae6c84d0657fbdba660 /libX11/src/xcms/cmsColNm.c | |
| parent | 1dad159fe09ac3a88b21b98544880e5ecc0e8d54 (diff) | |
| download | vcxsrv-c87efef42f76c2ff0dcfad2842ab369beffd21de.tar.gz vcxsrv-c87efef42f76c2ff0dcfad2842ab369beffd21de.tar.bz2 vcxsrv-c87efef42f76c2ff0dcfad2842ab369beffd21de.zip | |
Added libX11-1.2.2.tar.gz.
Diffstat (limited to 'libX11/src/xcms/cmsColNm.c')
| -rw-r--r-- | libX11/src/xcms/cmsColNm.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libX11/src/xcms/cmsColNm.c b/libX11/src/xcms/cmsColNm.c index e3ca5183d..8aa495857 100644 --- a/libX11/src/xcms/cmsColNm.c +++ b/libX11/src/xcms/cmsColNm.c @@ -4,7 +4,7 @@ /* * 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 @@ -12,10 +12,10 @@ * 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 @@ -187,7 +187,7 @@ _XcmsParseColorString( * DESCRIPTION * Assuming color_string contains a numerical string color * specification, attempts to parse a string into an - * XcmsColor structure. + * XcmsColor structure. * * RETURNS * 0 if failed; otherwise non-zero. @@ -470,7 +470,7 @@ Retry: pair->flag = CYCLE; return(XcmsFailure); } - + if (_XcmsParseColorString(ccc, pair->second, pColor) == XcmsSuccess) { /* f2 contains a numerical string specification */ return(XcmsSuccess); @@ -816,7 +816,7 @@ _XcmsCopyISOLatin1Lowered( /* * NAME - * _XcmsResolveColorString - + * _XcmsResolveColorString - * * SYNOPSIS */ @@ -872,7 +872,7 @@ _XcmsResolveColorString ( if (result_format != XcmsUndefinedFormat && pColor_exact_return->format != result_format) { /* need to be converted to the target format */ - return(XcmsConvertColors(ccc, pColor_exact_return, 1, + return(XcmsConvertColors(ccc, pColor_exact_return, 1, result_format, (Bool *)NULL)); } else { return(XcmsSuccess); |