svn merge ^/branches/released .

1 files changed, 124 insertions, 126 deletions

diff --git a/libXfont/src/util/format.c b/libXfont/src/util/format.c
index 6700721f9..60afac9b8 100644
--- a/libXfont/src/util/format.c
+++ b/libXfont/src/util/format.c
@@ -1,126 +1,124 @@
-/* $Xorg: format.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-/*
- * Copyright 1990, 1991 Network Computing Devices;
- * Portions Copyright 1987 by Digital Equipment Corporation
- *
- * 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, and that the names of Network Computing Devices or Digital 
- * not be used in advertising or publicity pertaining to distribution of the 
- * software without specific, written prior permission. Network Computing 
- * Devices and Digital make no representations about the suitability of 
- * this software for any purpose.  It is provided "as is" without express 
- * or implied warranty.
- *
- * NETWORK COMPUTING DEVICES AND DIGITAL DISCLAIM ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES OR DIGITAL 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 PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
-
-Copyright 1987, 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.
-
-*/
-/* $XFree86: xc/lib/font/util/format.c,v 1.4 2001/01/17 19:43:33 dawes Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include	<X11/fonts/FSproto.h>
-#include	<X11/fonts/font.h>
-#include	<X11/fonts/fontstruct.h>
-#include	<X11/fonts/fontutil.h>
-
-int
-CheckFSFormat(fsBitmapFormat format, 
-	      fsBitmapFormatMask fmask, 
-	      int *bit_order, 
-	      int *byte_order, 
-	      int *scan, 
-	      int *glyph, 
-	      int *image)
-{
-    /* convert format to what the low levels want */
-    if (fmask & BitmapFormatMaskBit) {
-	*bit_order = format & BitmapFormatBitOrderMask;
-	*bit_order = (*bit_order == BitmapFormatBitOrderMSB)
-	    	     ? MSBFirst : LSBFirst;
-    }
-    if (fmask & BitmapFormatMaskByte) {
-	*byte_order = format & BitmapFormatByteOrderMask;
-	*byte_order = (*byte_order == BitmapFormatByteOrderMSB)
-	    	      ? MSBFirst : LSBFirst;
-    }
-    if (fmask & BitmapFormatMaskScanLineUnit) {
-	*scan = format & BitmapFormatScanlineUnitMask;
-	/* convert byte paddings into byte counts */
-	switch (*scan) {
-	case BitmapFormatScanlineUnit8:
-	    *scan = 1;
-	    break;
-	case BitmapFormatScanlineUnit16:
-	    *scan = 2;
-	    break;
-	case BitmapFormatScanlineUnit32:
-	    *scan = 4;
-	    break;
-	default:
-	    return BadFontFormat;
-	}
-    }
-    if (fmask & BitmapFormatMaskScanLinePad) {
-	*glyph = format & BitmapFormatScanlinePadMask;
-	/* convert byte paddings into byte counts */
-	switch (*glyph) {
-	case BitmapFormatScanlinePad8:
-	    *glyph = 1;
-	    break;
-	case BitmapFormatScanlinePad16:
-	    *glyph = 2;
-	    break;
-	case BitmapFormatScanlinePad32:
-	    *glyph = 4;
-	    break;
-	default:
-	    return BadFontFormat;
-	}
-    }
-    if (fmask & BitmapFormatMaskImageRectangle) {
-	*image = format & BitmapFormatImageRectMask;
-
-	if (*image != BitmapFormatImageRectMin &&
-		*image != BitmapFormatImageRectMaxWidth &&
-		*image != BitmapFormatImageRectMax)
-	    return BadFontFormat;
-    }
-    return Successful;
-}
+/*

+ * Copyright 1990, 1991 Network Computing Devices;

+ * Portions Copyright 1987 by Digital Equipment Corporation

+ *

+ * 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, and that the names of Network Computing Devices or Digital 

+ * not be used in advertising or publicity pertaining to distribution of the 

+ * software without specific, written prior permission. Network Computing 

+ * Devices and Digital make no representations about the suitability of 

+ * this software for any purpose.  It is provided "as is" without express 

+ * or implied warranty.

+ *

+ * NETWORK COMPUTING DEVICES AND DIGITAL DISCLAIM ALL WARRANTIES WITH

+ * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

+ * AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES OR DIGITAL 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 PERFORMANCE OF THIS SOFTWARE.

+ */

+

+/*

+

+Copyright 1987, 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	<X11/fonts/FSproto.h>

+#include	<X11/fonts/font.h>

+#include	<X11/fonts/fontstruct.h>

+#include	<X11/fonts/fontutil.h>

+

+int

+CheckFSFormat(fsBitmapFormat format, 

+	      fsBitmapFormatMask fmask, 

+	      int *bit_order, 

+	      int *byte_order, 

+	      int *scan, 

+	      int *glyph, 

+	      int *image)

+{

+    /* convert format to what the low levels want */

+    if (fmask & BitmapFormatMaskBit) {

+	*bit_order = format & BitmapFormatBitOrderMask;

+	*bit_order = (*bit_order == BitmapFormatBitOrderMSB)

+	    	     ? MSBFirst : LSBFirst;

+    }

+    if (fmask & BitmapFormatMaskByte) {

+	*byte_order = format & BitmapFormatByteOrderMask;

+	*byte_order = (*byte_order == BitmapFormatByteOrderMSB)

+	    	      ? MSBFirst : LSBFirst;

+    }

+    if (fmask & BitmapFormatMaskScanLineUnit) {

+	*scan = format & BitmapFormatScanlineUnitMask;

+	/* convert byte paddings into byte counts */

+	switch (*scan) {

+	case BitmapFormatScanlineUnit8:

+	    *scan = 1;

+	    break;

+	case BitmapFormatScanlineUnit16:

+	    *scan = 2;

+	    break;

+	case BitmapFormatScanlineUnit32:

+	    *scan = 4;

+	    break;

+	default:

+	    return BadFontFormat;

+	}

+    }

+    if (fmask & BitmapFormatMaskScanLinePad) {

+	*glyph = format & BitmapFormatScanlinePadMask;

+	/* convert byte paddings into byte counts */

+	switch (*glyph) {

+	case BitmapFormatScanlinePad8:

+	    *glyph = 1;

+	    break;

+	case BitmapFormatScanlinePad16:

+	    *glyph = 2;

+	    break;

+	case BitmapFormatScanlinePad32:

+	    *glyph = 4;

+	    break;

+	default:

+	    return BadFontFormat;

+	}

+    }

+    if (fmask & BitmapFormatMaskImageRectangle) {

+	*image = format & BitmapFormatImageRectMask;

+

+	if (*image != BitmapFormatImageRectMin &&

+		*image != BitmapFormatImageRectMaxWidth &&

+		*image != BitmapFormatImageRectMax)

+	    return BadFontFormat;

+    }

+    return Successful;

+}