diff options
| author | Richard Hughes <cyreve@gmail.com> | 2006-05-21 20:32:44 +0000 |
|---|---|---|
| committer | cyreve <cyreve@users.sourceforge.net> | 2006-05-21 20:32:44 +0000 |
| commit | 1c174dbf3d5d315a927b0bcb6d029cb94377241c (patch) | |
| tree | 14f8cc698c54da960240f89252b7d216349ad0d6 /src/libnrtype | |
| parent | added pdf metainfo author (diff) | |
| download | inkscape-1c174dbf3d5d315a927b0bcb6d029cb94377241c.tar.gz inkscape-1c174dbf3d5d315a927b0bcb6d029cb94377241c.zip | |
remove unnecessary casts which didn't compile on old versions of FreeType
(bzr r922)
Diffstat (limited to 'src/libnrtype')
| -rw-r--r-- | src/libnrtype/FontInstance.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libnrtype/FontInstance.cpp b/src/libnrtype/FontInstance.cpp index 504cab76a..8a0c9cb49 100644 --- a/src/libnrtype/FontInstance.cpp +++ b/src/libnrtype/FontInstance.cpp @@ -516,10 +516,10 @@ void font_instance::LoadGlyph(int glyph_id) } if ( theFace->glyph->format == ft_glyph_format_outline ) { FT_Outline_Funcs ft2_outline_funcs = { - (FT_Outline_MoveToFunc) ft2_move_to, - (FT_Outline_LineToFunc) ft2_line_to, - (FT_Outline_ConicToFunc) ft2_conic_to, - (FT_Outline_CubicToFunc) ft2_cubic_to, + ft2_move_to, + ft2_line_to, + ft2_conic_to, + ft2_cubic_to, 0, 0 }; n_g.outline=new Path; @@ -559,7 +559,7 @@ bool font_instance::FontMetrics(double &ascent,double &descent,double &leading) descent=fabs(otm.otmDescent*scale); leading=fabs(otm.otmLineGap*scale); #else - if ( !FT_IS_SCALABLE(theFace) ) return false; // bitmap font + if ( theFace->units_per_EM == 0 ) return false; // bitmap font ascent=fabs(((double)theFace->ascender)/((double)theFace->units_per_EM)); descent=fabs(((double)theFace->descender)/((double)theFace->units_per_EM)); leading=fabs(((double)theFace->height)/((double)theFace->units_per_EM)); |