Roll harfbuzz-ng 3b8fd9c48f4bde368bf2d465c148b9743a9216ee

third_party/harfbuzz-ng/src/hb-buffer.cc

 /*
  * Copyright © 1998-2004  David Turner and Werner Lemberg
  * Copyright © 2004,2007,2009,2010  Red Hat, Inc.
  * Copyright © 2011  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
@@ skipping 205 matching lines @@
 
   memset (pos, 0, sizeof (pos[0]) * len);
 }
 
 void
 hb_buffer_t::swap_buffers (void)
 {
   if (unlikely (in_error)) return;
 
   assert (have_output);
+  have_output = FALSE;
 
   if (out_info != info)
   {
     hb_glyph_info_t *tmp_string;
     tmp_string = info;
     info = out_info;
     out_info = tmp_string;
     pos = (hb_glyph_position_t *) out_info;
   }
 
@@ skipping 27 matching lines @@
     pinfo++;
   }
 
   idx  += num_in;
   out_len += num_out;
 }
 
 void
 hb_buffer_t::replace_glyphs (unsigned int num_in,
                              unsigned int num_out,
-                             const uint16_t *glyph_data)
+                             const uint32_t *glyph_data)
 {
   if (!make_room_for (num_in, num_out)) return;
 
   hb_glyph_info_t orig_info = info[idx];
   for (unsigned int i = 1; i < num_in; i++)
   {
     hb_glyph_info_t *inf = &info[idx + i];
     orig_info.cluster = MIN (orig_info.cluster, inf->cluster);
   }
 
@@ skipping 140 matching lines @@
     if (last_cluster != info[i].cluster) {
       reverse_range (start, i);
       start = i;
       last_cluster = info[i].cluster;
     }
   }
   reverse_range (start, i);
 }
 
 void
+hb_buffer_t::merge_clusters (unsigned int start,
+                             unsigned int end)
+{
+  unsigned int cluster = this->info[start].cluster;
+
+  for (unsigned int i = start + 1; i < end; i++)
+    cluster = MIN (cluster, this->info[i].cluster);
+  for (unsigned int i = start; i < end; i++)
+    this->info[i].cluster = cluster;
+}
+void
+hb_buffer_t::merge_out_clusters (unsigned int start,
+                                 unsigned int end)
+{
+  unsigned int cluster = this->out_info[start].cluster;
+
+  for (unsigned int i = start + 1; i < end; i++)
+    cluster = MIN (cluster, this->out_info[i].cluster);
+  for (unsigned int i = start; i < end; i++)
+    this->out_info[i].cluster = cluster;
+}
+
+void
 hb_buffer_t::guess_properties (void)
 {
   /* If script is set to INVALID, guess from buffer contents */
   if (props.script == HB_SCRIPT_INVALID) {
     for (unsigned int i = 0; i < len; i++) {
       hb_script_t script = hb_unicode_script (unicode, info[i].codepoint);
       if (likely (script != HB_SCRIPT_COMMON &&
                   script != HB_SCRIPT_INHERITED &&
                   script != HB_SCRIPT_UNKNOWN)) {
         props.script = script;
@@ skipping 406 matching lines @@
                      int             text_length,
                      unsigned int    item_offset,
                      int             item_length)
 {
 #define UTF_NEXT(S, E, U)       ((U) = *(S), (S)+1)
   ADD_UTF (uint32_t);
 #undef UTF_NEXT
 }