Update harfbuzz-ng to 0.9.24

third_party/harfbuzz-ng/src/hb-ot-map.cc

 /*
  * Copyright © 2009,2010  Red Hat, Inc.
  * Copyright © 2010,2011,2013  Google, Inc.
  *
  *  This is part of HarfBuzz, a text shaping library.
  *
  * Permission is hereby granted, without written agreement and without
  * license or royalty fees, to use, copy, modify, and distribute this
  * software and its documentation for any purpose, provided that the
  * above copyright notice and the following two paragraphs appear in
@@ skipping 22 matching lines @@
 
 void
 hb_ot_map_t::add_lookups (hb_face_t    *face,
                           unsigned int  table_index,
                           unsigned int  feature_index,
                           hb_mask_t     mask,
                           bool          auto_zwj)
 {
   unsigned int lookup_indices[32];
   unsigned int offset, len;
+  unsigned int table_lookup_count;
+
+  table_lookup_count = hb_ot_layout_table_get_lookup_count (face, table_tags[table_index]);
 
   offset = 0;
   do {
     len = ARRAY_LENGTH (lookup_indices);
     hb_ot_layout_feature_get_lookups (face,
                                       table_tags[table_index],
                                       feature_index,
                                       offset, &len,
                                       lookup_indices);
 
-    for (unsigned int i = 0; i < len; i++) {
+    for (unsigned int i = 0; i < len; i++)
+    {
+      if (lookup_indices[i] >= table_lookup_count)
+        continue;
       hb_ot_map_t::lookup_map_t *lookup = lookups[table_index].push ();
       if (unlikely (!lookup))
         return;
       lookup->mask = mask;
       lookup->index = lookup_indices[i];
       lookup->auto_zwj = auto_zwj;
     }
 
     offset += len;
   } while (len == ARRAY_LENGTH (lookup_indices));
@@ skipping 31 matching lines @@
   if (unlikely (!info)) return;
   info->tag = tag;
   info->seq = feature_infos.len;
   info->max_value = value;
   info->flags = flags;
   info->default_value = (flags & F_GLOBAL) ? value : 0;
   info->stage[0] = current_stage[0];
   info->stage[1] = current_stage[1];
 }
 
-inline void hb_ot_map_t::apply (unsigned int table_index,
-                                const hb_ot_shape_plan_t *plan,
-                                hb_font_t *font,
-                                hb_buffer_t *buffer) const
-{
-  unsigned int i = 0;
-
-  for (unsigned int stage_index = 0; stage_index < stages[table_index].len; stage_index++) {
-    const stage_map_t *stage = &stages[table_index][stage_index];
-    for (; i < stage->last_lookup; i++)
-      switch (table_index)
-      {
-        case 0:
-          hb_ot_layout_substitute_lookup (font, buffer, lookups[table_index][i].index,
-                                          lookups[table_index][i].mask,
-                                          lookups[table_index][i].auto_zwj);
-          break;
-
-        case 1:
-          hb_ot_layout_position_lookup (font, buffer, lookups[table_index][i].index,
-                                        lookups[table_index][i].mask,
-                                        lookups[table_index][i].auto_zwj);
-          break;
-      }
-
-    if (stage->pause_func)
-    {
-      buffer->clear_output ();
-      stage->pause_func (plan, font, buffer);
-    }
-  }
-}
-
-void hb_ot_map_t::substitute (const hb_ot_shape_plan_t *plan, hb_font_t *font, hb_buffer_t *buffer) const
-{
-  apply (0, plan, font, buffer);
-}
-
-void hb_ot_map_t::position (const hb_ot_shape_plan_t *plan, hb_font_t *font, hb_buffer_t *buffer) const
-{
-  apply (1, plan, font, buffer);
-}
-
 
 void hb_ot_map_t::collect_lookups (unsigned int table_index, hb_set_t *lookups_out) const
 {
   for (unsigned int i = 0; i < lookups[table_index].len; i++)
     hb_set_add (lookups_out, lookups[table_index][i].index);
 }
 
 void hb_ot_map_builder_t::add_pause (unsigned int table_index, hb_ot_map_t::pause_func_t pause_func)
 {
   stage_info_t *s = stages[table_index].push ();
@@ skipping 53 matching lines @@
     if ((info->flags & F_GLOBAL) && info->max_value == 1)
       /* Uses the global bit */
       bits_needed = 0;
     else
       bits_needed = _hb_bit_storage (info->max_value);
 
     if (!info->max_value || next_bit + bits_needed > 8 * sizeof (hb_mask_t))
       continue; /* Feature disabled, or not enough bits. */
 
 
-    bool found = false;
+    hb_bool_t found = false;
     unsigned int feature_index[2];
     for (unsigned int table_index = 0; table_index < 2; table_index++)
       found |= hb_ot_layout_language_find_feature (face,
                                                    table_tags[table_index],
                                                    script_index[table_index],
                                                    language_index[table_index],
                                                    info->tag,
                                                    &feature_index[table_index]);
     if (!found && !(info->flags & F_HAS_FALLBACK))
       continue;
@@ skipping 77 matching lines @@
         if (likely (stage_map)) {
           stage_map->last_lookup = last_num_lookups;
           stage_map->pause_func = stages[table_index][stage_index].pause_func;
         }
 
         stage_index++;
       }
     }
   }
 }