summaryrefslogtreecommitdiff
path: root/src/bitmap/pcfread.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 18:44:23 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 18:44:23 +0000
commit3d75ea33ecf80c3539b38a993092cd16325a9525 (patch)
tree2c833d7262e8c8e52b052930b7cef9053abf1943 /src/bitmap/pcfread.c
parent8ee2a19ff0295d625baf0b42e0a8bb7f4ad575fd (diff)
Merging XORG-CURRENT into trunk
Diffstat (limited to 'src/bitmap/pcfread.c')
-rw-r--r--src/bitmap/pcfread.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/bitmap/pcfread.c b/src/bitmap/pcfread.c
index a7843cb..0b4b6c7 100644
--- a/src/bitmap/pcfread.c
+++ b/src/bitmap/pcfread.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/font/bitmap/pcfread.c,v 1.22 2003/11/18 01:17:04 dawes Exp $ */
+/* $XFree86: xc/lib/font/bitmap/pcfread.c,v 1.21 2003/11/17 22:20:22 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
@@ -908,7 +908,6 @@ pmfReadFont(FontPtr pFont, FontFilePtr file,
if (IS_EOF(file)) goto Bail;
if (encodingOffset == 0xFFFF) {
pFont->info.allExist = FALSE;
- encoding[i] = 0;
} else {
if(!encoding[SEGMENT_MAJOR(i)]) {
encoding[SEGMENT_MAJOR(i)]=