Roll harfbuzz-ng 3b8fd9c48f4bde368bf2d465c148b9743a9216ee

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

 /*
  * Copyright © 2011  Martin Hosken
  * Copyright © 2011  SIL International
  * 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 112 matching lines @@
     free (old);
   }
   gr_face_destroy (f->grface);
 }
 
 static void _hb_gr_font_data_destroy (void *data)
 {
   hb_gr_font_data_t *f = (hb_gr_font_data_t *) data;
 
   gr_font_destroy (f->grfont);
+  free (f);
 }
 
 static hb_user_data_key_t hb_gr_data_key;
 
 static hb_gr_face_data_t *
 _hb_gr_face_get_data (hb_face_t *face)
 {
   hb_gr_face_data_t *data = (hb_gr_face_data_t *) hb_face_get_user_data (face, &hb_gr_data_key);
   if (likely (data)) return data;
 
@@ skipping 62 matching lines @@
       return data;
     else
       return &_hb_gr_font_data_nil;
   }
 
   return data;
 }
 
 
 hb_bool_t
-hb_graphite_shape (hb_font_t          *font,
+_hb_graphite_shape (hb_font_t          *font,
                    hb_buffer_t        *buffer,
                    const hb_feature_t *features,
-                   unsigned int        num_features,
-                   const char * const *shaper_options)
+                   unsigned int        num_features)
 {
 
   buffer->guess_properties ();
 
+  /* XXX We do a hell of a lot of stuff just to figure out this font
+   * is not graphite!  Shouldn't do. */
+
   hb_gr_font_data_t *data = _hb_gr_font_get_data (font);
   if (!data->grface) return FALSE;
 
   unsigned int charlen;
   hb_glyph_info_t *bufferi = hb_buffer_get_glyph_infos (buffer, &charlen);
 
   int success = 0;
 
   if (!charlen) return TRUE;
 
   const char *lang = hb_language_to_string (hb_buffer_get_language (buffer));
   const char *lang_end = strchr (lang, '-');
   int lang_len = lang_end ? lang_end - lang : -1;
   gr_feature_val *feats = gr_face_featureval_for_lang (data->grface, lang ? hb_tag_from_string (lang, lang_len) : 0);
 
   while (num_features--)
   {
     const gr_feature_ref *fref = gr_face_find_fref (data->grface, features->tag);
     if (fref)
       gr_fref_set_feature_value (fref, features->value, feats);
     features++;
   }
 
-  unsigned short *gids = NULL;
+  hb_codepoint_t *gids = NULL, *pg;
   hb_gr_cluster_t *clusters = NULL;
   gr_segment *seg = NULL;
   uint32_t *text = NULL;
-  unsigned short *pg;
   const gr_slot *is;
   unsigned int ci = 0, ic = 0;
   float curradvx = 0., curradvy = 0.;
   unsigned int glyphlen = 0;
   unsigned int *p;
 
   text = (uint32_t *) malloc ((charlen + 1) * sizeof (uint32_t));
   if (!text) goto dieout;
 
   p = text;
   for (unsigned int i = 0; i < charlen; ++i)
     *p++ = bufferi++->codepoint;
   *p = 0;
 
   hb_tag_t script_tag[2];
   hb_ot_tags_from_script (hb_buffer_get_script (buffer), &script_tag[0], &script_tag[1]);
 
   seg = gr_make_seg (data->grfont, data->grface,
                      script_tag[1] == HB_TAG_NONE ? script_tag[0] : script_tag[1],
                      feats,
                      gr_utf32, text, charlen,
                      2 | (hb_buffer_get_direction (buffer) == HB_DIRECTION_RTL ? 1 : 0));
   if (!seg) goto dieout;
 
   glyphlen = gr_seg_n_slots (seg);
   clusters = (hb_gr_cluster_t *) calloc (charlen, sizeof (hb_gr_cluster_t));
   if (!glyphlen || !clusters) goto dieout;
 
-  gids = (uint16_t *) malloc (glyphlen * sizeof (uint16_t));
+  gids = (hb_codepoint_t *) malloc (glyphlen * sizeof (hb_codepoint_t));
   if (!gids) goto dieout;
 
   pg = gids;
   for (is = gr_seg_first_slot (seg), ic = 0; is; is = gr_slot_next_in_segment (is), ic++)
   {
     unsigned int before = gr_slot_before (is);
     unsigned int after = gr_slot_after (is);
     *pg = gr_slot_gid (is);
     pg++;
     while (clusters[ci].base_char > before && ci)
@@ skipping 48 matching lines @@
 
   success = 1;
 
 dieout:
   if (gids) free (gids);
   if (clusters) free (clusters);
   if (seg) gr_seg_destroy (seg);
   if (text) free (text);
   return success;
 }