From 76a82bc4d2571b18970ab70f197de784230a4155 Mon Sep 17 00:00:00 2001 From: Fred Kiefer Date: Sun, 13 Apr 2008 19:39:33 +0000 Subject: [PATCH] * Source/xlib/GSXftFontInfo.m (Ones): Correct the parameter * name. * Source/winlib/WIN32FontInfo.m (-glyphIsEncoded:): Add * parameter to windows call to supress defaults glyphs for missing ones. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@26444 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ Source/winlib/WIN32FontInfo.m | 3 ++- Source/xlib/GSXftFontInfo.m | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7276e5a..f2ea0f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-04-11 Fred Kiefer + + * Source/xlib/GSXftFontInfo.m (Ones): Correct the parameter name. + * Source/winlib/WIN32FontInfo.m (-glyphIsEncoded:): Add parameter + to windows call to supress defaults glyphs for missing ones. + 2008-04-08 Fred Kiefer * Source/gsc/GSGState.m (-_paintPath:, -_doComplexPath:...): diff --git a/Source/winlib/WIN32FontInfo.m b/Source/winlib/WIN32FontInfo.m index e947af2..5464313 100644 --- a/Source/winlib/WIN32FontInfo.m +++ b/Source/winlib/WIN32FontInfo.m @@ -167,7 +167,8 @@ NSLog(@"No glyph for U%d", c); hdc = CreateCompatibleDC(NULL); old = SelectObject(hdc, hFont); // Convert from GNUstep glyph (unichar) to windows glyph. - if ((GetGlyphIndicesW(hdc, &c, 1, &windowsGlyph, 0) == GDI_ERROR) + if ((GetGlyphIndicesW(hdc, &c, 1, &windowsGlyph, + GGI_MARK_NONEXISTING_GLYPHS) == GDI_ERROR) || (windowsGlyph == 0xFFFF)) { result = NO; diff --git a/Source/xlib/GSXftFontInfo.m b/Source/xlib/GSXftFontInfo.m index d5829fe..2e3a1d0 100644 --- a/Source/xlib/GSXftFontInfo.m +++ b/Source/xlib/GSXftFontInfo.m @@ -301,7 +301,7 @@ static NSArray *faFromFc(FcPattern *pat) #else /* Otherwise fall back on HACKMEM 169. */ static int -Ones(unsigned int mask) +Ones(unsigned int n) { register unsigned int tmp;