Upgrade to latest harfbuzz

[apps/core/preloaded/video-player.git] / src / hb-ot-map.cc

diff --git a/src/hb-ot-map.cc b/src/hb-ot-map.cc
index 782c496..bebf3ed 100644 (file)
--- a/src/hb-ot-map.cc
+++ b/src/hb-ot-map.cc
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2009,2010  Red Hat, Inc.
- * Copyright © 2010  Google, Inc.
+ * Copyright © 2010,2011  Google, Inc.
  *
  *  This is part of HarfBuzz, a text shaping library.
  *
@@ -30,7 +30,6 @@
 
 #include "hb-ot-shape-private.hh"
 
-HB_BEGIN_DECLS
 
 
 void
@@ -77,67 +76,48 @@ void hb_ot_map_builder_t::add_feature (hb_tag_t tag, unsigned int value, bool gl
   info->stage[1] = current_stage[1];
 }
 
-
-void hb_ot_map_t::substitute (hb_face_t *face, hb_buffer_t *buffer) const {
-  unsigned int table_index = 0;
+void hb_ot_map_t::apply (unsigned int table_index,
+                        hb_ot_map_t::apply_lookup_func_t apply_lookup_func,
+                        void *face_or_font,
+                        hb_buffer_t *buffer) const
+{
   unsigned int i = 0;
 
   for (unsigned int pause_index = 0; pause_index < pauses[table_index].len; pause_index++) {
     const pause_map_t *pause = &pauses[table_index][pause_index];
     for (; i < pause->num_lookups; i++)
-      hb_ot_layout_substitute_lookup (face, buffer, lookups[table_index][i].index, lookups[table_index][i].mask);
+      apply_lookup_func (face_or_font, buffer, lookups[table_index][i].index, lookups[table_index][i].mask);
 
-    pause->callback.func.gsub (this, face, buffer, pause->callback.user_data);
+    pause->callback.func (this, face_or_font, buffer, pause->callback.user_data);
   }
 
   for (; i < lookups[table_index].len; i++)
-    hb_ot_layout_substitute_lookup (face, buffer, lookups[table_index][i].index, lookups[table_index][i].mask);
+    apply_lookup_func (face_or_font, buffer, lookups[table_index][i].index, lookups[table_index][i].mask);
 }
 
-void hb_ot_map_t::position (hb_font_t *font, hb_buffer_t *buffer) const {
-  unsigned int table_index = 1;
+void hb_ot_map_t::substitute_closure (hb_face_t *face,
+                                     hb_set_t *glyphs) const
+{
+  unsigned int table_index = 0;
   unsigned int i = 0;
 
   for (unsigned int pause_index = 0; pause_index < pauses[table_index].len; pause_index++) {
     const pause_map_t *pause = &pauses[table_index][pause_index];
     for (; i < pause->num_lookups; i++)
-      hb_ot_layout_position_lookup (font, buffer, lookups[table_index][i].index, lookups[table_index][i].mask);
-
-    pause->callback.func.gpos (this, font, buffer, pause->callback.user_data);
+      hb_ot_layout_substitute_closure_lookup (face, glyphs, lookups[table_index][i].index);
   }
 
   for (; i < lookups[table_index].len; i++)
-    hb_ot_layout_position_lookup (font, buffer, lookups[table_index][i].index, lookups[table_index][i].mask);
+    hb_ot_layout_substitute_closure_lookup (face, glyphs, lookups[table_index][i].index);
 }
 
-
-/* TODO refactor the following two functions */
-
-void hb_ot_map_builder_t::add_gsub_pause (hb_ot_map_t::gsub_pause_func_t pause_func, void *user_data)
+void hb_ot_map_builder_t::add_pause (unsigned int table_index, hb_ot_map_t::pause_func_t pause_func, void *user_data)
 {
-  unsigned int table_index = 0;
-
-  if (pause_func) {
-    pause_info_t *p = pauses[table_index].push ();
-    if (likely (p)) {
-      p->stage = current_stage[table_index];
-      p->callback.func.gsub = pause_func;
-      p->callback.user_data = user_data;
-    }
-  }
-
-  current_stage[table_index]++;
-}
-
-void hb_ot_map_builder_t::add_gpos_pause (hb_ot_map_t::gpos_pause_func_t pause_func, void *user_data)
-{
-  unsigned int table_index = 1;
-
   if (pause_func) {
     pause_info_t *p = pauses[table_index].push ();
     if (likely (p)) {
       p->stage = current_stage[table_index];
-      p->callback.func.gpos = pause_func;
+      p->callback.func = pause_func;
       p->callback.user_data = user_data;
     }
   }
@@ -168,7 +148,7 @@ hb_ot_map_builder_t::compile (hb_face_t *face,
   unsigned int script_index[2], language_index[2];
   for (unsigned int table_index = 0; table_index < 2; table_index++) {
     hb_tag_t table_tag = table_tags[table_index];
-    hb_ot_layout_table_choose_script (face, table_tag, script_tags, &script_index[table_index]);
+    hb_ot_layout_table_choose_script (face, table_tag, script_tags, &script_index[table_index], &m.chosen_script[table_index]);
     hb_ot_layout_script_find_language (face, table_tag, script_index[table_index], language_tag, &language_index[table_index]);
   }
 
@@ -307,4 +287,3 @@ hb_ot_map_builder_t::compile (hb_face_t *face,
 }
 
 
-HB_END_DECLS