ref: 6af01a04b1fb6db7f6fadf19211d24b893c1c6bc
parent: d32a7d32e4176fc63c7935d23042aeeed9b9ee93
author: Werner Lemberg <[email protected]>
date: Sat Dec 28 03:55:24 EST 2013
[autofit] Use `global' HarfBuzz font object. We now use `hb_font' instead of `hb_face' since yet-to-come changes need this. * src/autofit/afglobal.h: Include `hbshim.h'. (AF_FaceGlobalsRec) [FT_CONFIG_OPTION_USE_HARFBUZZ]: New member `hb_font'. * src/autofit/afglobal.c (af_face_globals_new) [FT_CONFIG_OPTION_USE_HARFBUZZ]: Create `hb_font'. (af_face_globals_free) [FT_CONFIG_OPTION_USE_HARFBUZZ]: Destroy `hb_font'. * src/autofit/hbshim.h: Include HarfBuzz headers. * src/autofit/hbshim.c: Include `hbshim.h' instead of HarfBuzz headers. (af_get_coverage): Updated.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2013-12-28 Werner Lemberg <[email protected]>
+
+ [autofit] Use `global' HarfBuzz font object.
+
+ We now use `hb_font' instead of `hb_face' since yet-to-come changes
+ need this.
+
+ * src/autofit/afglobal.h: Include `hbshim.h'.
+ (AF_FaceGlobalsRec) [FT_CONFIG_OPTION_USE_HARFBUZZ]: New member
+ `hb_font'.
+
+ * src/autofit/afglobal.c (af_face_globals_new)
+ [FT_CONFIG_OPTION_USE_HARFBUZZ]: Create `hb_font'.
+ (af_face_globals_free) [FT_CONFIG_OPTION_USE_HARFBUZZ]: Destroy
+ `hb_font'.
+
+ * src/autofit/hbshim.h: Include HarfBuzz headers.
+
+ * src/autofit/hbshim.c: Include `hbshim.h' instead of HarfBuzz
+ headers.
+ (af_get_coverage): Updated.
+
2013-12-27 Werner Lemberg <[email protected]>
[autofit] Handle `DFLT' OpenType script for coverages.
--- a/src/autofit/afglobal.c
+++ b/src/autofit/afglobal.c
@@ -20,6 +20,7 @@
#include "afranges.h"
#include "hbshim.h"
+
/* get writing system specific header files */
#undef WRITING_SYSTEM
#define WRITING_SYSTEM( ws, WS ) /* empty */
@@ -254,6 +255,10 @@
globals->glyph_styles = (FT_Byte*)( globals + 1 );
globals->module = module;
+#ifdef FT_CONFIG_OPTION_USE_HARFBUZZ
+ globals->hb_font = hb_ft_font_create( face, NULL );
+#endif
+
error = af_face_globals_compute_style_coverage( globals );
if ( error )
{@@ -294,6 +299,11 @@
FT_FREE( globals->metrics[nn] );
}
}
+
+#ifdef FT_CONFIG_OPTION_USE_HARFBUZZ
+ hb_font_destroy( globals->hb_font );
+ globals->hb_font = NULL;
+#endif
globals->glyph_count = 0;
globals->glyph_styles = NULL; /* no need to free this one! */
--- a/src/autofit/afglobal.h
+++ b/src/autofit/afglobal.h
@@ -23,6 +23,7 @@
#include "aftypes.h"
#include "afmodule.h"
+#include "hbshim.h"
FT_BEGIN_HEADER
@@ -100,6 +101,10 @@
FT_Face face;
FT_Long glyph_count; /* same as face->num_glyphs */
FT_Byte* glyph_styles;
+
+#ifdef FT_CONFIG_OPTION_USE_HARFBUZZ
+ hb_font_t* hb_font;
+#endif
/* per-face auto-hinter properties */
FT_UInt increase_x_height;
--- a/src/autofit/hbshim.c
+++ b/src/autofit/hbshim.c
@@ -18,15 +18,11 @@
#include <ft2build.h>
#include FT_FREETYPE_H
+#include "hbshim.h"
-
#ifdef FT_CONFIG_OPTION_USE_HARFBUZZ
-#include <hb.h>
-#include <hb-ot.h>
-#include <hb-ft.h>
-
/*************************************************************************/
/* */
/* The macro FT_COMPONENT is used in trace mode. It is an implicit */
@@ -160,7 +156,7 @@
if ( !globals || !style_class || !gstyles )
return FT_THROW( Invalid_Argument );
- face = hb_ft_face_create( globals->face, NULL );
+ face = hb_font_get_face( globals->hb_font );
lookups = hb_set_create();
glyphs = hb_set_create();
@@ -266,8 +262,6 @@
hb_set_destroy( lookups );
hb_set_destroy( glyphs );
-
- hb_face_destroy( face );
return FT_Err_Ok;
}
--- a/src/autofit/hbshim.h
+++ b/src/autofit/hbshim.h
@@ -26,6 +26,10 @@
#ifdef FT_CONFIG_OPTION_USE_HARFBUZZ
+#include <hb.h>
+#include <hb-ot.h>
+#include <hb-ft.h>
+
FT_BEGIN_HEADER