svn merge ^/branches/released .

1 files changed, 216 insertions, 219 deletions

diff --git a/libXfont/src/bitmap/fontink.c b/libXfont/src/bitmap/fontink.c
index a9606f039..551b81b28 100644
--- a/libXfont/src/bitmap/fontink.c
+++ b/libXfont/src/bitmap/fontink.c
@@ -1,219 +1,216 @@
-/* $Xorg: fontink.c,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */
-
-/*
-
-Copyright 1990, 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/bitmap/fontink.c,v 1.6 2001/01/17 19:43:27 dawes Exp $ */
-
-/*
- * Author:  Keith Packard, MIT X Consortium
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <X11/fonts/fntfilst.h>
-#include <X11/fonts/bitmap.h>
-#include <X11/fonts/bdfint.h>
-
-static unsigned char ink_mask_msb[8] = {
-    0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01,
-};
-
-static unsigned char ink_mask_lsb[8] = {
-    0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,
-};
-
-void
-FontCharInkMetrics(FontPtr pFont, CharInfoPtr pCI, xCharInfo *pInk)
-{
-    int         leftBearing,
-                ascent,
-                descent;
-    register int vpos,
-                hpos,
-                bpos = 0;
-    int         bitmapByteWidth,
-                bitmapByteWidthPadded;
-    int         bitmapBitWidth;
-    int         span;
-    register unsigned char *p;
-    unsigned char *ink_mask = 0;
-    register int bmax;
-    register unsigned char charbits;
-
-    if (pFont->bit == MSBFirst)
-	ink_mask = ink_mask_msb;
-    else if (pFont->bit == LSBFirst)
-	ink_mask = ink_mask_lsb;
-    pInk->characterWidth = pCI->metrics.characterWidth;
-    pInk->attributes = pCI->metrics.attributes;
-
-    leftBearing = pCI->metrics.leftSideBearing;
-    ascent = pCI->metrics.ascent;
-    descent = pCI->metrics.descent;
-    bitmapBitWidth = GLYPHWIDTHPIXELS(pCI);
-    bitmapByteWidth = GLYPHWIDTHBYTES(pCI);
-    bitmapByteWidthPadded = BYTES_PER_ROW(bitmapBitWidth, pFont->glyph);
-    span = bitmapByteWidthPadded - bitmapByteWidth;
-
-    p = (unsigned char *) pCI->bits;
-    for (vpos = descent + ascent; --vpos >= 0;) {
-	for (hpos = bitmapByteWidth; --hpos >= 0;) {
-	    if (*p++ != 0)
-		goto found_ascent;
-	}
-	p += span;
-    }
-    /*
-     * special case -- font with no bits gets all zeros
-     */
-    pInk->leftSideBearing = leftBearing;
-    pInk->rightSideBearing = leftBearing;
-    pInk->ascent = 0;
-    pInk->descent = 0;
-    return;
-found_ascent:
-    pInk->ascent = vpos - descent + 1;
-
-    p = ((unsigned char *) pCI->bits) + bitmapByteWidthPadded * 
-	(descent + ascent - 1) + bitmapByteWidth;
-
-    for (vpos = descent + ascent; --vpos >= 0;) {
-	for (hpos = bitmapByteWidth; --hpos >= 0;) {
-	    if (*--p != 0)
-		goto found_descent;
-	}
-	p -= span;
-    }
-found_descent:
-    pInk->descent = vpos - ascent + 1;
-
-    bmax = 8;
-    for (hpos = 0; hpos < bitmapByteWidth; hpos++) {
-	charbits = 0;
-	p = (unsigned char *) pCI->bits + hpos;
-	for (vpos = descent + ascent; --vpos >= 0; p += bitmapByteWidthPadded)
-	    charbits |= *p;
-	if (charbits) {
-	    if (hpos == bitmapByteWidth - 1)
-		bmax = bitmapBitWidth - (hpos << 3);
-	    p = ink_mask;
-	    for (bpos = bmax; --bpos >= 0;) {
-		if (charbits & *p++)
-		    goto found_left;
-	    }
-	}
-    }
-found_left:
-    pInk->leftSideBearing = leftBearing + (hpos << 3) + bmax - bpos - 1;
-
-    bmax = bitmapBitWidth - ((bitmapByteWidth - 1) << 3);
-    for (hpos = bitmapByteWidth; --hpos >= 0;) {
-	charbits = 0;
-	p = (unsigned char *) pCI->bits + hpos;
-	for (vpos = descent + ascent; --vpos >= 0; p += bitmapByteWidthPadded)
-	    charbits |= *p;
-	if (charbits) {
-	    p = ink_mask + bmax;
-	    for (bpos = bmax; --bpos >= 0;) {
-		if (charbits & *--p)
-		    goto found_right;
-	    }
-	}
-	bmax = 8;
-    }
-found_right:
-    pInk->rightSideBearing = leftBearing + (hpos << 3) + bpos + 1;
-}
-
-#define	ISBITONMSB(x, line)	((line)[(x)/8] & (1 << (7-((x)%8))))
-#define	SETBITMSB(x, line)	((line)[(x)/8] |= (1 << (7-((x)%8))))
-#define	ISBITONLSB(x, line)	((line)[(x)/8] & (1 << ((x)%8)))
-#define	SETBITLSB(x, line)	((line)[(x)/8] |= (1 << ((x)%8)))
-
-#define Min(a,b)    ((a)<(b)?(a):(b))
-#define Max(a,b)    ((a)>(b)?(a):(b))
-
-void
-FontCharReshape(FontPtr pFont, CharInfoPtr pSrc, CharInfoPtr pDst)
-{
-    int         x,
-                y;
-    unsigned char *in_line,
-               *out_line;
-    unsigned char *oldglyph,
-               *newglyph;
-    int         inwidth;
-    int         outwidth,
-                outheight;
-    int         out_bytes,
-                in_bytes;
-    int         y_min,
-                y_max,
-                x_min,
-                x_max;
-
-    newglyph = (unsigned char *) pDst->bits;
-    outwidth = pDst->metrics.rightSideBearing - pDst->metrics.leftSideBearing;
-    outheight = pDst->metrics.descent + pDst->metrics.ascent;
-    out_bytes = BYTES_PER_ROW(outwidth, pFont->glyph);
-
-    oldglyph = (unsigned char *) pSrc->bits;
-    inwidth = pSrc->metrics.rightSideBearing - pSrc->metrics.leftSideBearing;
-    in_bytes = BYTES_PER_ROW(inwidth, pFont->glyph);
-
-    bzero(newglyph, out_bytes * outheight);
-    in_line = oldglyph;
-    out_line = newglyph;
-    y_min = Max(-pSrc->metrics.ascent, -pDst->metrics.ascent);
-    y_max = Min(pSrc->metrics.descent, pDst->metrics.descent);
-    x_min = Max(pSrc->metrics.leftSideBearing, pDst->metrics.leftSideBearing);
-    x_max = Min(pSrc->metrics.rightSideBearing, pDst->metrics.rightSideBearing);
-    in_line += (y_min + pSrc->metrics.ascent) * in_bytes;
-    out_line += (y_min + pDst->metrics.ascent) * out_bytes;
-    if (pFont->bit == MSBFirst) {
-	for (y = y_min; y < y_max; y++) {
-	    for (x = x_min; x < x_max; x++) {
-		if (ISBITONMSB(x - pSrc->metrics.leftSideBearing, in_line))
-		    SETBITMSB(x - pDst->metrics.leftSideBearing, out_line);
-	    }
-	    in_line += in_bytes;
-	    out_line += out_bytes;
-	}
-    } else {
-	for (y = y_min; y < y_max; y++) {
-	    for (x = x_min; x < x_max; x++) {
-		if (ISBITONLSB(x - pSrc->metrics.leftSideBearing, in_line))
-		    SETBITLSB(x - pDst->metrics.leftSideBearing, out_line);
-	    }
-	    in_line += in_bytes;
-	    out_line += out_bytes;
-	}
-    }
-}
+/*

+

+Copyright 1990, 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>

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

+

+static unsigned char ink_mask_msb[8] = {

+    0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01,

+};

+

+static unsigned char ink_mask_lsb[8] = {

+    0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,

+};

+

+void

+FontCharInkMetrics(FontPtr pFont, CharInfoPtr pCI, xCharInfo *pInk)

+{

+    int         leftBearing,

+                ascent,

+                descent;

+    register int vpos,

+                hpos,

+                bpos = 0;

+    int         bitmapByteWidth,

+                bitmapByteWidthPadded;

+    int         bitmapBitWidth;

+    int         span;

+    register unsigned char *p;

+    unsigned char *ink_mask = 0;

+    register int bmax;

+    register unsigned char charbits;

+

+    if (pFont->bit == MSBFirst)

+	ink_mask = ink_mask_msb;

+    else if (pFont->bit == LSBFirst)

+	ink_mask = ink_mask_lsb;

+    pInk->characterWidth = pCI->metrics.characterWidth;

+    pInk->attributes = pCI->metrics.attributes;

+

+    leftBearing = pCI->metrics.leftSideBearing;

+    ascent = pCI->metrics.ascent;

+    descent = pCI->metrics.descent;

+    bitmapBitWidth = GLYPHWIDTHPIXELS(pCI);

+    bitmapByteWidth = GLYPHWIDTHBYTES(pCI);

+    bitmapByteWidthPadded = BYTES_PER_ROW(bitmapBitWidth, pFont->glyph);

+    span = bitmapByteWidthPadded - bitmapByteWidth;

+

+    p = (unsigned char *) pCI->bits;

+    for (vpos = descent + ascent; --vpos >= 0;) {

+	for (hpos = bitmapByteWidth; --hpos >= 0;) {

+	    if (*p++ != 0)

+		goto found_ascent;

+	}

+	p += span;

+    }

+    /*

+     * special case -- font with no bits gets all zeros

+     */

+    pInk->leftSideBearing = leftBearing;

+    pInk->rightSideBearing = leftBearing;

+    pInk->ascent = 0;

+    pInk->descent = 0;

+    return;

+found_ascent:

+    pInk->ascent = vpos - descent + 1;

+

+    p = ((unsigned char *) pCI->bits) + bitmapByteWidthPadded * 

+	(descent + ascent - 1) + bitmapByteWidth;

+

+    for (vpos = descent + ascent; --vpos >= 0;) {

+	for (hpos = bitmapByteWidth; --hpos >= 0;) {

+	    if (*--p != 0)

+		goto found_descent;

+	}

+	p -= span;

+    }

+found_descent:

+    pInk->descent = vpos - ascent + 1;

+

+    bmax = 8;

+    for (hpos = 0; hpos < bitmapByteWidth; hpos++) {

+	charbits = 0;

+	p = (unsigned char *) pCI->bits + hpos;

+	for (vpos = descent + ascent; --vpos >= 0; p += bitmapByteWidthPadded)

+	    charbits |= *p;

+	if (charbits) {

+	    if (hpos == bitmapByteWidth - 1)

+		bmax = bitmapBitWidth - (hpos << 3);

+	    p = ink_mask;

+	    for (bpos = bmax; --bpos >= 0;) {

+		if (charbits & *p++)

+		    goto found_left;

+	    }

+	}

+    }

+found_left:

+    pInk->leftSideBearing = leftBearing + (hpos << 3) + bmax - bpos - 1;

+

+    bmax = bitmapBitWidth - ((bitmapByteWidth - 1) << 3);

+    for (hpos = bitmapByteWidth; --hpos >= 0;) {

+	charbits = 0;

+	p = (unsigned char *) pCI->bits + hpos;

+	for (vpos = descent + ascent; --vpos >= 0; p += bitmapByteWidthPadded)

+	    charbits |= *p;

+	if (charbits) {

+	    p = ink_mask + bmax;

+	    for (bpos = bmax; --bpos >= 0;) {

+		if (charbits & *--p)

+		    goto found_right;

+	    }

+	}

+	bmax = 8;

+    }

+found_right:

+    pInk->rightSideBearing = leftBearing + (hpos << 3) + bpos + 1;

+}

+

+#define	ISBITONMSB(x, line)	((line)[(x)/8] & (1 << (7-((x)%8))))

+#define	SETBITMSB(x, line)	((line)[(x)/8] |= (1 << (7-((x)%8))))

+#define	ISBITONLSB(x, line)	((line)[(x)/8] & (1 << ((x)%8)))

+#define	SETBITLSB(x, line)	((line)[(x)/8] |= (1 << ((x)%8)))

+

+#define Min(a,b)    ((a)<(b)?(a):(b))

+#define Max(a,b)    ((a)>(b)?(a):(b))

+

+void

+FontCharReshape(FontPtr pFont, CharInfoPtr pSrc, CharInfoPtr pDst)

+{

+    int         x,

+                y;

+    unsigned char *in_line,

+               *out_line;

+    unsigned char *oldglyph,

+               *newglyph;

+    int         inwidth;

+    int         outwidth,

+                outheight;

+    int         out_bytes,

+                in_bytes;

+    int         y_min,

+                y_max,

+                x_min,

+                x_max;

+

+    newglyph = (unsigned char *) pDst->bits;

+    outwidth = pDst->metrics.rightSideBearing - pDst->metrics.leftSideBearing;

+    outheight = pDst->metrics.descent + pDst->metrics.ascent;

+    out_bytes = BYTES_PER_ROW(outwidth, pFont->glyph);

+

+    oldglyph = (unsigned char *) pSrc->bits;

+    inwidth = pSrc->metrics.rightSideBearing - pSrc->metrics.leftSideBearing;

+    in_bytes = BYTES_PER_ROW(inwidth, pFont->glyph);

+

+    bzero(newglyph, out_bytes * outheight);

+    in_line = oldglyph;

+    out_line = newglyph;

+    y_min = Max(-pSrc->metrics.ascent, -pDst->metrics.ascent);

+    y_max = Min(pSrc->metrics.descent, pDst->metrics.descent);

+    x_min = Max(pSrc->metrics.leftSideBearing, pDst->metrics.leftSideBearing);

+    x_max = Min(pSrc->metrics.rightSideBearing, pDst->metrics.rightSideBearing);

+    in_line += (y_min + pSrc->metrics.ascent) * in_bytes;

+    out_line += (y_min + pDst->metrics.ascent) * out_bytes;

+    if (pFont->bit == MSBFirst) {

+	for (y = y_min; y < y_max; y++) {

+	    for (x = x_min; x < x_max; x++) {

+		if (ISBITONMSB(x - pSrc->metrics.leftSideBearing, in_line))

+		    SETBITMSB(x - pDst->metrics.leftSideBearing, out_line);

+	    }

+	    in_line += in_bytes;

+	    out_line += out_bytes;

+	}

+    } else {

+	for (y = y_min; y < y_max; y++) {

+	    for (x = x_min; x < x_max; x++) {

+		if (ISBITONLSB(x - pSrc->metrics.leftSideBearing, in_line))

+		    SETBITLSB(x - pDst->metrics.leftSideBearing, out_line);

+	    }

+	    in_line += in_bytes;

+	    out_line += out_bytes;

+	}

+    }

+}