[pango/harfbuzz-ng-external] [HB] More update to HarfBuzz API change

[Behdad Esfahbod <behdad src gnome org>]

commit 754f002608028e18ba204a59c5a0ee92aa3bc9b7
Author: Behdad Esfahbod <behdad behdad org>
Date:   Wed Apr 20 14:21:09 2011 -0400

    [HB] More update to HarfBuzz API change

 modules/basic/basic-fc.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/modules/basic/basic-fc.c b/modules/basic/basic-fc.c
index 9010ab6..c24aa80 100644
--- a/modules/basic/basic-fc.c
+++ b/modules/basic/basic-fc.c
@@ -257,8 +257,8 @@ basic_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED,
   hb_font = hb_font_create ();
   hb_font_set_funcs (hb_font,
 		     pango_fc_get_hb_font_funcs (),
-		     NULL,
-		     &context);
+		     &context,
+		     NULL);
   hb_font_set_scale (hb_font,
 		     /* XXX CTM */
 		     ((guint64) ft_face->size->metrics.x_scale * ft_face->units_per_EM) >> 12,
@@ -271,7 +271,7 @@ basic_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED,
   hb_buffer = acquire_buffer (&free_buffer);
   /* setup buffer */
   hb_buffer_set_direction (hb_buffer, analysis->level % 2 != 0 ? HB_DIRECTION_RTL : HB_DIRECTION_LTR);
-  hb_buffer_set_script (hb_buffer, analysis->script);
+  hb_buffer_set_script (hb_buffer, hb_glib_script_to_script (analysis->script));
   hb_buffer_set_language (hb_buffer, hb_language_from_string (pango_language_to_string (analysis->language)));
   hb_buffer_add_utf8 (hb_buffer, text, length, 0, length);