gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-02-23 11:51:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Check properly for control glyphs.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@19301 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Alexander Malmberg 2004-05-13 15:14:46 +00:00
parent bd0bd21d94
commit d68191c313
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2004-05-13 17:11 Alexander Malmberg <alexander@malmberg.org>
* Source/art/ftfont.m (-advancementForGlyph:): Return a zero size for
control glyphs.
(-positionOfGlyph:precededByGlyph:isNominal:): Check if either glyph
is a control glyph before converting to freetype glyph indices.
2004-05-12 Fred Kiefer <FredKiefer@gmx.de>
* Headers/win32/WIN32Geometry.h: (GSWindowOriginToMS) corrected computation.

11
Source/art/ftfont.m
View file

@ -2087,6 +2087,11 @@ static FT_Error ft_get_face(FTC_FaceID fid, FT_Library lib, FT_Pointer data, FT_
{
FT_Error error;
if (glyph == NSControlGlyph
|| glyph == GSAttachmentGlyph
|| glyph == NSNullGlyph)
return NSZeroSize;
glyph--;
if (screenFont)
{
@ -2196,15 +2201,15 @@ static FT_Error ft_get_face(FTC_FaceID fid, FT_Library lib, FT_Pointer data, FT_
FT_Vector vec;
FT_GlyphSlot glyph;
g--;
prev--;
if (nominal)
*nominal = YES;
if (g == NSControlGlyph || prev == NSControlGlyph)
return NSZeroPoint;
g--;
prev--;
if (FTC_Manager_Lookup_Size(ftc_manager, &imgd.font, &face, 0))
return NSZeroPoint;