[HarfBuzz] harfbuzz-ng: Branch 'master'

[Behdad Esfahbod]

 src/hb-ot-shape.cc |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 81a77b115db401f69e869690f24b9047370bdfde
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Jun 1 23:03:54 2010 -0400

    Make feature sorting stable

diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc
index 1fe0d17..705d1f5 100644
--- a/src/hb-ot-shape.cc
+++ b/src/hb-ot-shape.cc
@@ -102,6 +102,7 @@ struct hb_mask_allocator_t {
   struct feature_info_t {
     hb_tag_t tag;
     unsigned int value;
+    unsigned int seq;
     bool global;
 
     static int
@@ -113,7 +114,7 @@ struct hb_mask_allocator_t {
       if (a->tag != b->tag)
         return a->tag < b->tag ? -1 : 1;
 
-      return p1 < p2 ? -1 : 1;
+      return a->seq < b->seq ? -1 : 1;
     }
   };
 
@@ -142,6 +143,7 @@ struct hb_mask_allocator_t {
     feature_info_t *info = &infos[count++];
     info->tag = tag;
     info->value = value;
+    info->seq = count;
     info->global = global;
   }