[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-buffer.cc |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 66c6a48b6ce9dab6375ba1a23d7e450d6974852a
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Apr 14 15:55:42 2014 -0700

    Add HB_NO_MERGE_CLUSTERS
    
    Disables any cluster-merging.  Added for testing purposes while
    we investigate what kind of API to add for this.

diff --git a/src/hb-buffer.cc b/src/hb-buffer.cc
index d6c6fcb..76bb10c 100644
--- a/src/hb-buffer.cc
+++ b/src/hb-buffer.cc
@@ -500,6 +500,10 @@ void
 hb_buffer_t::merge_clusters (unsigned int start,
 			     unsigned int end)
 {
+#ifdef HB_NO_MERGE_CLUSTERS
+  return;
+#endif
+
   if (unlikely (end - start < 2))
     return;
 
@@ -528,6 +532,10 @@ void
 hb_buffer_t::merge_out_clusters (unsigned int start,
 				 unsigned int end)
 {
+#ifdef HB_NO_MERGE_CLUSTERS
+  return;
+#endif
+
   if (unlikely (end - start < 2))
     return;