Roll harfbuzz-ng 3b8fd9c48f4bde368bf2d465c148b9743a9216ee

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

 /*
  * 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
  * above copyright notice and the following two paragraphs appear in
  * all copies of this software.
@@ skipping 205 matching lines @@
 hb_uniscribe_font_get_hfont (hb_font_t *font)
 {
   hb_uniscribe_font_data_t *font_data = _hb_uniscribe_font_get_data (font);
   if (unlikely (!font_data))
     return 0;
   return font_data->hfont;
 }
 
 
 hb_bool_t
-hb_uniscribe_shape (hb_font_t          *font,
-                    hb_buffer_t        *buffer,
-                    const hb_feature_t *features,
-                    unsigned int        num_features,
-                    const char * const *shaper_options)
+_hb_uniscribe_shape (hb_font_t          *font,
+                     hb_buffer_t        *buffer,
+                     const hb_feature_t *features,
+                     unsigned int        num_features)
 {
   buffer->guess_properties ();
 
 #define FAIL(...) \
   HB_STMT_START { \
     DEBUG_MSG (UNISCRIBE, NULL, __VA_ARGS__); \
     return FALSE; \
   } HB_STMT_END;
 
   hb_uniscribe_face_data_t *face_data = _hb_uniscribe_face_get_data (font->face);
@@ skipping 112 matching lines @@
                                 wchars + chars_offset,
                                 item_chars_len,
                                 glyphs_size - glyphs_offset,
                                 /* out */
                                 log_clusters + chars_offset,
                                 char_props + chars_offset,
                                 glyphs + glyphs_offset,
                                 glyph_props + glyphs_offset,
                                 (int *) &glyphs_len);
 
+      for (unsigned int j = chars_offset; j < chars_offset + item_chars_len; j++)
+        log_clusters[j] += glyphs_offset;
+
       if (unlikely (items[i].a.fNoGlyphIndex))
         FAIL ("ScriptShapeOpenType() set fNoGlyphIndex");
       if (unlikely (hr == E_OUTOFMEMORY))
       {
         buffer->ensure (buffer->allocated * 2);
         if (buffer->in_error)
           FAIL ("Buffer resize failed");
         goto retry;
       }
       if (unlikely (hr == USP_E_SCRIPT_NOT_IN_FONT))
@@ skipping 81 matching lines @@
     pos->x_advance = info->mask;
     pos->x_offset = info->var1.u32;
     pos->y_offset = info->var2.u32;
   }
 
   /* Wow, done! */
   return TRUE;
 }