AuroraMiddleware/harfbuzz
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ft] FT_Get_Advance() for advance-width callbacks

Browse Source 
Using graphite2's comparerenderer suggests that this makes hb-ft 15
times faster.  No caching layer needed anymore.
This commit is contained in:
Behdad Esfahbod 2011-08-15 20:41:59 +02:00
parent 97796453aa
commit 0b7e4d9f20
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -134,7 +134,7 @@ AM_CONDITIONAL(HAVE_ICU, $have_icu)
dnl ========================================================================== dnl ==========================================================================
PKG_CHECK_MODULES(FREETYPE, freetype2, have_freetype=true, have_freetype=false) PKG_CHECK_MODULES(FREETYPE, freetype2 >= 2.3.8, have_freetype=true, have_freetype=false)
if $have_freetype; then if $have_freetype; then
AC_DEFINE(HAVE_FREETYPE, 1, [Have FreeType 2 library]) AC_DEFINE(HAVE_FREETYPE, 1, [Have FreeType 2 library])
_save_libs="$LIBS" _save_libs="$LIBS"

19
src/hb-ft.cc
View File

@ -31,6 +31,7 @@
#include "hb-font-private.hh" #include "hb-font-private.hh"
#include FT_ADVANCES_H
#include FT_TRUETYPE_TABLES_H #include FT_TRUETYPE_TABLES_H
@ -47,9 +48,13 @@
* *
* - We don't handle any load_flags. That definitely has API implications. :( * - We don't handle any load_flags. That definitely has API implications. :(
* I believe hb_ft_font_create() should take load_flags input. * I believe hb_ft_font_create() should take load_flags input.
* In particular, FT_Get_Advance() without the NO_HINTING flag seems to be
* buggy.
* *
* - We don't handle / allow for emboldening / obliqueing. * - We don't handle / allow for emboldening / obliqueing.
* *
* - Rounding, etc?
*
* - In the future, we should add constructors to create fonts in font space. * - In the future, we should add constructors to create fonts in font space.
* *
* - I believe transforms are not correctly implemented. FreeType does not * - I believe transforms are not correctly implemented. FreeType does not
@ -89,12 +94,13 @@ hb_ft_get_glyph_h_advance (hb_font_t *font HB_UNUSED,
void *user_data HB_UNUSED) void *user_data HB_UNUSED)
{ {
FT_Face ft_face = (FT_Face) font_data; FT_Face ft_face = (FT_Face) font_data;
int load_flags = FT_LOAD_DEFAULT; int load_flags = FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING;
FT_Fixed v;
if (unlikely (FT_Load_Glyph (ft_face, glyph, load_flags))) if (unlikely (FT_Get_Advance (ft_face, glyph, load_flags, &v)))
return 0; return 0;
return ft_face->glyph->metrics.horiAdvance; return v >> 10;
} }
static hb_position_t static hb_position_t
@ -104,14 +110,15 @@ hb_ft_get_glyph_v_advance (hb_font_t *font HB_UNUSED,
void *user_data HB_UNUSED) void *user_data HB_UNUSED)
{ {
FT_Face ft_face = (FT_Face) font_data; FT_Face ft_face = (FT_Face) font_data;
int load_flags = FT_LOAD_DEFAULT; int load_flags = FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING | FT_LOAD_VERTICAL_LAYOUT;
FT_Fixed v;
if (unlikely (FT_Load_Glyph (ft_face, glyph, load_flags))) if (unlikely (FT_Get_Advance (ft_face, glyph, load_flags, &v)))
return 0; return 0;
/* Note: FreeType's vertical metrics grows downward while other FreeType coordinates /* Note: FreeType's vertical metrics grows downward while other FreeType coordinates
* have a Y growing upward. Hence the extra negation. */ * have a Y growing upward. Hence the extra negation. */
return -ft_face->glyph->metrics.vertAdvance; return -v >> 10;
} }
static hb_bool_t static hb_bool_t

4
util/common.hh
View File

@ -44,6 +44,8 @@
#include <glib.h> #include <glib.h>
#include <glib/gprintf.h> #include <glib/gprintf.h>
void fail (const char *format, ...);
void fail (const char *format, ...) G_GNUC_NORETURN;
#endif #endif