Bug 485621 – Get rid of freetype memory allocator in harfbuzz

2007-10-11  Behdad Esfahbod  <behdad@gnome.org>

        Bug 485621 – Get rid of freetype memory allocator in harfbuzz

        * pango/opentype/*: Remove all occurences of FT_Memory.  Use
        malloc/realloc/free directly.

        * pango/pango-ot*: Update to above.


svn path=/trunk/; revision=2432

1 files changed, 1 insertions, 10 deletions

diff --git a/pango/pango-ot-buffer.c b/pango/pango-ot-buffer.c
index 39a63060..c10f1fc9 100644
--- a/pango/pango-ot-buffer.c
+++ b/pango/pango-ot-buffer.c
@@ -38,16 +38,9 @@
 PangoOTBuffer *
 pango_ot_buffer_new (PangoFcFont *font)
 {
-  /* We lock the font here immediately for the silly reason
-   * of getting the FT_Memory; otherwise we'd have to
-   * add a new operation to PangoFcFontmap; callers will
-   * probably already have the font locked, however,
-   * so there is little performance penalty.
-   */
   PangoOTBuffer *buffer = g_slice_new (PangoOTBuffer);
-  FT_Face face = pango_fc_font_lock_face (font);
 
-  if (hb_buffer_new (face->memory, &buffer->buffer) != HB_Err_Ok)
+  if (hb_buffer_new (&buffer->buffer) != HB_Err_Ok)
     g_warning ("Allocation of HB_Buffer failed"); /* this doesn't happen */
 
   buffer->font = g_object_ref (font);
@@ -55,8 +48,6 @@ pango_ot_buffer_new (PangoFcFont *font)
   buffer->rtl = FALSE;
   buffer->zero_width_marks = FALSE;
 
-  pango_fc_font_unlock_face (font);
-
   return buffer;
 }