gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-23 16:10:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up includes. Fix handling of screen fonts for flipped fonts.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@15741 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Alexander Malmberg 2003-01-27 17:14:10 +00:00
parent ff599a6236
commit e5b20ddaed
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2003-01-27 18:10 Alexander Malmberg <alexander@malmberg.org>
* Source/art/ftfont.m: Clean up includes.
(-initWithFontName:matrix:screenFont:): Use absolute values of the
matrix entries when checking if a screen font entry should be used.
2003-01-26 21:24 Alexander Malmberg <alexander@malmberg.org>
* Source/xlib/GSXftFontInfo.m: Update with screen font changes in

14
Source/art/ftfont.m
View file

@ -582,7 +582,7 @@ static FT_Error ft_get_face(FTC_FaceID fid, FT_Library lib, FT_Pointer data, FT_
@implementation FTFontInfo
- initWithFontName: (NSString*)name
- initWithFontName: (NSString *)name
matrix: (const float *)fmatrix
screenFont: (BOOL)p_screenFont
{
@ -628,15 +628,14 @@ static FT_Error ft_get_face(FTC_FaceID fid, FT_Library lib, FT_Pointer data, FT_
mostCompatibleStringEncoding = NSUTF8StringEncoding;
encodingScheme = @"iso10646-1";
imgd.font.pix_width = matrix[0];
imgd.font.pix_height = matrix[3];
imgd.font.pix_width = fabs(matrix[0]);
imgd.font.pix_height = fabs(matrix[3]);
screenFont = p_screenFont;
rfi = font_entry->files;
if (screenFont && font_entry->num_sizes &&
((imgd.font.pix_width == imgd.font.pix_height) ||
(imgd.font.pix_width == -imgd.font.pix_height)))
imgd.font.pix_width == imgd.font.pix_height)
{
int i;
for (i = 0; i < font_entry->num_sizes; i++)
@ -705,7 +704,7 @@ static FT_Error ft_get_face(FTC_FaceID fid, FT_Library lib, FT_Pointer data, FT_
}
extern void GSToUnicode();
#include <gnustep/base/Unicode.h>
/* TODO: the current point probably needs updating after drawing is done */
@ -2433,6 +2432,7 @@ static int filters[3][7]=
/*
GSLayoutManager glyph generation code.
*/
#include <Foundation/NSCharacterSet.h>
#include <AppKit/GSLayoutManager_internal.h>
#include <AppKit/NSTextStorage.h>
@ -2491,8 +2491,6 @@ fb04 'ffl'
unichar buf[c];
// printf("_generateGlyphsForRun: %p %i+%i\n",run,pos,run->head.char_length);
[[_textStorage string] getCharacters: buf
range: NSMakeRange(pos,c)];