Bug #4381: Fix BDF corruption. (Laurent Deniel)XORG-7_0_99_901

2 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index ae39319..11613fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-03  Adam Jackson  <ajax@freedesktop.org>
+
+	* chars.c:
+	Bug #4381: Fix BDF corruption.  (Laurent Deniel)
+
 2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
 	* configure.ac:
diff --git a/chars.c b/chars.c
index d221ccb..ec4217d 100644
--- a/chars.c
+++ b/chars.c
@@ -1,5 +1,5 @@
 /* $Xorg: chars.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */
-/* $XdotOrg: $ */
+/* $XdotOrg: app/fstobdf/chars.c,v 1.3 2005/10/31 16:05:45 alanc Exp $ */
 /*
  
 Copyright 1990, 1998  The Open Group
@@ -214,7 +214,8 @@ EmitCharacters(FILE *outFile,
   	  encoding=(chHigh << 8)+chLow;
 	if ((charInfo->width != 0) || (charInfo->right != charInfo->left))
 	    EmitBitmap(outFile, fontHeader, charInfo, encoding, bpr, glyph);
-	glyph += (charInfo->descent + charInfo->ascent) * bpr;
+	glyph = glyphs +
+	    offsets[encoding-((firstCharHigh << 8)+firstCharLow) + 1].position;
 	charInfo++;
       }
     }