Roll HarfBuzz to 0.9.32

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

 /*
  * Copyright © 2011,2012,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
  * all copies of this software.
@@ skipping 361 matching lines @@
 
   OT::name &name = OT::StructAtOffset<OT::name> (new_sfnt_data, name_table_offset);
   name.format.set (0);
   name.count.set (ARRAY_LENGTH (name_IDs));
   name.stringOffset.set (name.get_size ());
   for (unsigned int i = 0; i < ARRAY_LENGTH (name_IDs); i++)
   {
     OT::NameRecord &record = name.nameRecord[i];
     record.platformID.set (3);
     record.encodingID.set (1);
-    record.languageID.set (0x0409); /* English */
+    record.languageID.set (0x0409u); /* English */
     record.nameID.set (name_IDs[i]);
     record.length.set (name_str_len * 2);
     record.offset.set (0);
   }
 
   /* Copy string data from new_name, converting wchar_t to UTF16BE. */
   unsigned char *p = &OT::StructAfter<unsigned char> (name);
   for (unsigned int i = 0; i < name_str_len; i++)
   {
     *p++ = new_name[i] >> 8;
@@ skipping 231 matching lines @@
       event->start = true;
       event->feature = feature;
 
       event = feature_events.push ();
       if (unlikely (!event))
         goto fail_features;
       event->index = features[i].end;
       event->start = false;
       event->feature = feature;
     }
-    feature_events.sort ();
+    feature_events.qsort ();
     /* Add a strategic final event. */
     {
       active_feature_t feature;
       feature.rec.tagFeature = 0;
       feature.rec.lParameter = 0;
       feature.order = num_features + 1;
 
       feature_event_t *event = feature_events.push ();
       if (unlikely (!event))
         goto fail_features;
@@ skipping 11 matching lines @@
 
       if (event->index != last_index)
       {
         /* Save a snapshot of active features and the range. */
         range_record_t *range = range_records.push ();
         if (unlikely (!range))
           goto fail_features;
 
         unsigned int offset = feature_records.len;
 
-        active_features.sort ();
+        active_features.qsort ();
         for (unsigned int j = 0; j < active_features.len; j++)
         {
           if (!j || active_features[j].rec.tagFeature != feature_records[feature_records.len - 1].tagFeature)
           {
             OPENTYPE_FEATURE_RECORD *feature = feature_records.push ();
             if (unlikely (!feature))
               goto fail_features;
             *feature = active_features[j].rec;
           }
           else
@@ skipping 65 matching lines @@
 
 #define utf16_index() var1.u32
 
   ALLOCATE_ARRAY (WCHAR, pchars, buffer->len * 2);
 
   unsigned int chars_len = 0;
   for (unsigned int i = 0; i < buffer->len; i++)
   {
     hb_codepoint_t c = buffer->info[i].codepoint;
     buffer->info[i].utf16_index() = chars_len;
-    if (likely (c < 0x10000))
+    if (likely (c <= 0xFFFFu))
       pchars[chars_len++] = c;
-    else if (unlikely (c >= 0x110000))
-      pchars[chars_len++] = 0xFFFD;
+    else if (unlikely (c > 0x10FFFFu))
+      pchars[chars_len++] = 0xFFFDu;
     else {
-      pchars[chars_len++] = 0xD800 + ((c - 0x10000) >> 10);
-      pchars[chars_len++] = 0xDC00 + ((c - 0x10000) & ((1 << 10) - 1));
+      pchars[chars_len++] = 0xD800u + ((c - 0x10000u) >> 10);
+      pchars[chars_len++] = 0xDC00u + ((c - 0x10000u) & ((1 << 10) - 1));
     }
   }
 
   ALLOCATE_ARRAY (WORD, log_clusters, chars_len);
   ALLOCATE_ARRAY (SCRIPT_CHARPROP, char_props, chars_len);
 
   if (num_features)
   {
     /* Need log_clusters to assign features. */
     chars_len = 0;
     for (unsigned int i = 0; i < buffer->len; i++)
     {
       hb_codepoint_t c = buffer->info[i].codepoint;
       unsigned int cluster = buffer->info[i].cluster;
       log_clusters[chars_len++] = cluster;
-      if (c >= 0x10000 && c < 0x110000)
+      if (hb_in_range (c, 0x10000u, 0x10FFFFu))
         log_clusters[chars_len++] = cluster; /* Surrogates. */
     }
   }
 
   /* The -2 in the following is to compensate for possible
    * alignment needed after the WORD array.  sizeof(WORD) == 2. */
   unsigned int glyphs_size = (scratch_size * sizeof (int) - 2)
                            / (sizeof (WORD) +
                               sizeof (SCRIPT_GLYPHPROP) +
                               sizeof (int) +
@@ skipping 225 matching lines @@
   }
 
   if (backward)
     hb_buffer_reverse (buffer);
 
   /* Wow, done! */
   return true;
 }