Synchronised line endinge with release branch

1 files changed, 157 insertions, 157 deletions

diff --git a/libXfont/src/bitmap/bitmap.c b/libXfont/src/bitmap/bitmap.c
index f837deafd..1ceb4bb17 100644
--- a/libXfont/src/bitmap/bitmap.c
+++ b/libXfont/src/bitmap/bitmap.c
@@ -1,157 +1,157 @@
-/*

-

-Copyright 1991, 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.

-

-*/

-

-/*

- * Author:  Keith Packard, MIT X Consortium

- */

-

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-

-#include <X11/fonts/fntfilst.h>

-#include <X11/fonts/bitmap.h>

-

-int

-bitmapGetGlyphs(FontPtr pFont, unsigned long count, unsigned char *chars, 

-		FontEncoding charEncoding, 

-		unsigned long *glyphCount, 	/* RETURN */

-		CharInfoPtr *glyphs) 		/* RETURN */

-{

-    BitmapFontPtr  bitmapFont;

-    unsigned int firstCol;

-    register unsigned int numCols;

-    unsigned int firstRow;

-    unsigned int numRows;

-    CharInfoPtr *glyphsBase;

-    register unsigned int c;

-    register CharInfoPtr pci;

-    unsigned int r;

-    CharInfoPtr **encoding;

-    CharInfoPtr pDefault;

-

-    bitmapFont = (BitmapFontPtr) pFont->fontPrivate;

-    encoding = bitmapFont->encoding;

-    pDefault = bitmapFont->pDefault;

-    firstCol = pFont->info.firstCol;

-    numCols = pFont->info.lastCol - firstCol + 1;

-    glyphsBase = glyphs;

-    switch (charEncoding) {

-

-    case Linear8Bit:

-    case TwoD8Bit:

-	if (pFont->info.firstRow > 0)

-	    break;

-	if (pFont->info.allExist && pDefault) {

-	    while (count--) {

-		c = (*chars++) - firstCol;

-		if (c < numCols)

-		    *glyphs++ = ACCESSENCODING(encoding,c);

-		else

-		    *glyphs++ = pDefault;

-	    }

-	} else {

-	    while (count--) {

-		c = (*chars++) - firstCol;

-		if (c < numCols && (pci = ACCESSENCODING(encoding,c)))

-		    *glyphs++ = pci;

-		else if (pDefault)

-		    *glyphs++ = pDefault;

-	    }

-	}

-	break;

-    case Linear16Bit:

-	if (pFont->info.allExist && pDefault) {

-	    while (count--) {

-		c = *chars++ << 8;

-		c = (c | *chars++) - firstCol;

-		if (c < numCols)

-		    *glyphs++ = ACCESSENCODING(encoding,c);

-		else

-		    *glyphs++ = pDefault;

-	    }

-	} else {

-	    while (count--) {

-		c = *chars++ << 8;

-		c = (c | *chars++) - firstCol;

-		if (c < numCols && (pci = ACCESSENCODING(encoding,c)))

-		    *glyphs++ = pci;

-		else if (pDefault)

-		    *glyphs++ = pDefault;

-	    }

-	}

-	break;

-

-    case TwoD16Bit:

-	firstRow = pFont->info.firstRow;

-	numRows = pFont->info.lastRow - firstRow + 1;

-	while (count--) {

-	    r = (*chars++) - firstRow;

-	    c = (*chars++) - firstCol;

-	    if (r < numRows && c < numCols &&

-		    (pci = ACCESSENCODING(encoding, r * numCols + c)))

-		*glyphs++ = pci;

-	    else if (pDefault)

-		*glyphs++ = pDefault;

-	}

-	break;

-    }

-    *glyphCount = glyphs - glyphsBase;

-    return Successful;

-}

-

-static CharInfoRec nonExistantChar;

-

-int

-bitmapGetMetrics(FontPtr pFont, unsigned long count, unsigned char *chars, 

-		 FontEncoding charEncoding, 

-		 unsigned long *glyphCount,	/* RETURN */

-		 xCharInfo **glyphs)		/* RETURN */

-{

-    int         ret;

-    xCharInfo  *ink_metrics;

-    CharInfoPtr metrics;

-    BitmapFontPtr  bitmapFont;

-    CharInfoPtr	oldDefault;

-    int         i;

-

-    bitmapFont = (BitmapFontPtr) pFont->fontPrivate;

-    oldDefault = bitmapFont->pDefault;

-    bitmapFont->pDefault = &nonExistantChar;

-    ret = bitmapGetGlyphs(pFont, count, chars, charEncoding, glyphCount, (CharInfoPtr *) glyphs);

-    if (ret == Successful) {

-	if (bitmapFont->ink_metrics) {

-	    metrics = bitmapFont->metrics;

-	    ink_metrics = bitmapFont->ink_metrics;

-	    for (i = 0; i < *glyphCount; i++) {

-		if (glyphs[i] != (xCharInfo *) & nonExistantChar)

-		    glyphs[i] = ink_metrics + (((CharInfoPtr) glyphs[i]) - metrics);

-	    }

-	}

-    }

-    bitmapFont->pDefault = oldDefault;

-    return ret;

-}

+/*
+
+Copyright 1991, 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.
+
+*/
+
+/*
+ * Author:  Keith Packard, MIT X Consortium
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <X11/fonts/fntfilst.h>
+#include <X11/fonts/bitmap.h>
+
+int
+bitmapGetGlyphs(FontPtr pFont, unsigned long count, unsigned char *chars, 
+		FontEncoding charEncoding, 
+		unsigned long *glyphCount, 	/* RETURN */
+		CharInfoPtr *glyphs) 		/* RETURN */
+{
+    BitmapFontPtr  bitmapFont;
+    unsigned int firstCol;
+    register unsigned int numCols;
+    unsigned int firstRow;
+    unsigned int numRows;
+    CharInfoPtr *glyphsBase;
+    register unsigned int c;
+    register CharInfoPtr pci;
+    unsigned int r;
+    CharInfoPtr **encoding;
+    CharInfoPtr pDefault;
+
+    bitmapFont = (BitmapFontPtr) pFont->fontPrivate;
+    encoding = bitmapFont->encoding;
+    pDefault = bitmapFont->pDefault;
+    firstCol = pFont->info.firstCol;
+    numCols = pFont->info.lastCol - firstCol + 1;
+    glyphsBase = glyphs;
+    switch (charEncoding) {
+
+    case Linear8Bit:
+    case TwoD8Bit:
+	if (pFont->info.firstRow > 0)
+	    break;
+	if (pFont->info.allExist && pDefault) {
+	    while (count--) {
+		c = (*chars++) - firstCol;
+		if (c < numCols)
+		    *glyphs++ = ACCESSENCODING(encoding,c);
+		else
+		    *glyphs++ = pDefault;
+	    }
+	} else {
+	    while (count--) {
+		c = (*chars++) - firstCol;
+		if (c < numCols && (pci = ACCESSENCODING(encoding,c)))
+		    *glyphs++ = pci;
+		else if (pDefault)
+		    *glyphs++ = pDefault;
+	    }
+	}
+	break;
+    case Linear16Bit:
+	if (pFont->info.allExist && pDefault) {
+	    while (count--) {
+		c = *chars++ << 8;
+		c = (c | *chars++) - firstCol;
+		if (c < numCols)
+		    *glyphs++ = ACCESSENCODING(encoding,c);
+		else
+		    *glyphs++ = pDefault;
+	    }
+	} else {
+	    while (count--) {
+		c = *chars++ << 8;
+		c = (c | *chars++) - firstCol;
+		if (c < numCols && (pci = ACCESSENCODING(encoding,c)))
+		    *glyphs++ = pci;
+		else if (pDefault)
+		    *glyphs++ = pDefault;
+	    }
+	}
+	break;
+
+    case TwoD16Bit:
+	firstRow = pFont->info.firstRow;
+	numRows = pFont->info.lastRow - firstRow + 1;
+	while (count--) {
+	    r = (*chars++) - firstRow;
+	    c = (*chars++) - firstCol;
+	    if (r < numRows && c < numCols &&
+		    (pci = ACCESSENCODING(encoding, r * numCols + c)))
+		*glyphs++ = pci;
+	    else if (pDefault)
+		*glyphs++ = pDefault;
+	}
+	break;
+    }
+    *glyphCount = glyphs - glyphsBase;
+    return Successful;
+}
+
+static CharInfoRec nonExistantChar;
+
+int
+bitmapGetMetrics(FontPtr pFont, unsigned long count, unsigned char *chars, 
+		 FontEncoding charEncoding, 
+		 unsigned long *glyphCount,	/* RETURN */
+		 xCharInfo **glyphs)		/* RETURN */
+{
+    int         ret;
+    xCharInfo  *ink_metrics;
+    CharInfoPtr metrics;
+    BitmapFontPtr  bitmapFont;
+    CharInfoPtr	oldDefault;
+    int         i;
+
+    bitmapFont = (BitmapFontPtr) pFont->fontPrivate;
+    oldDefault = bitmapFont->pDefault;
+    bitmapFont->pDefault = &nonExistantChar;
+    ret = bitmapGetGlyphs(pFont, count, chars, charEncoding, glyphCount, (CharInfoPtr *) glyphs);
+    if (ret == Successful) {
+	if (bitmapFont->ink_metrics) {
+	    metrics = bitmapFont->metrics;
+	    ink_metrics = bitmapFont->ink_metrics;
+	    for (i = 0; i < *glyphCount; i++) {
+		if (glyphs[i] != (xCharInfo *) & nonExistantChar)
+		    glyphs[i] = ink_metrics + (((CharInfoPtr) glyphs[i]) - metrics);
+	    }
+	}
+    }
+    bitmapFont->pDefault = oldDefault;
+    return ret;
+}