commit d292885893395dcb345dce1010e5c8628a715ef4
author Behdad Esfahbod <behdad@behdad.org> Tue May 03 01:03:53 2011 -0400
committer Behdad Esfahbod <behdad@behdad.org> Tue May 03 01:03:53 2011 -0400
tree fcdd0af7da03baf0b2d233d75b6d17494d7517e5
parent 2000179487b49e0d504ec127450dc6fcb5568cec

[ft] Fix font->face handling

Don't use _cached()

src/hb-ft.cc

diff --git a/src/hb-ft.cc b/src/hb-ft.cc
index e4e77f5..9d1dbd1 100644
--- a/src/hb-ft.cc
+++ b/src/hb-ft.cc
@@ -238,11 +238,14 @@
 		   hb_destroy_func_t destroy)
 {
   hb_font_t *font;
+  hb_face_t *face;
 
-  font = hb_font_create (hb_ft_face_create_cached (ft_face));
+  face = hb_ft_face_create (ft_face, destroy);
+  font = hb_font_create (face);
+  hb_face_destroy (face);
   hb_font_set_funcs (font,
 		     hb_ft_get_font_funcs (),
-		     ft_face, destroy);
+		     ft_face, NULL);
   hb_font_set_scale (font,
 		     ((uint64_t) ft_face->size->metrics.x_scale * (uint64_t) ft_face->units_per_EM) >> 16,
 		     ((uint64_t) ft_face->size->metrics.y_scale * (uint64_t) ft_face->units_per_EM) >> 16);