[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-buffer.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cc1e0840baed881f2bfd8468a9645bfe94f47303
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Feb 6 10:20:48 2018 -0500

    [buffer] Tweak diff re glyph_flags again
    
    We expect the buffer to have no flags that the reference doesn't...
    Meh. Makes MORX tests pass now. Need to better define the behavior.

diff --git a/src/hb-buffer.cc b/src/hb-buffer.cc
index c2463612..dc0639f4 100644
--- a/src/hb-buffer.cc
+++ b/src/hb-buffer.cc
@@ -1933,7 +1933,7 @@ hb_buffer_diff (hb_buffer_t *buffer,
       result |= HB_BUFFER_DIFF_FLAG_CODEPOINT_MISMATCH;
     if (buf_info->cluster != ref_info->cluster)
       result |= HB_BUFFER_DIFF_FLAG_CLUSTER_MISMATCH;
-    if (((buf_info->mask & HB_GLYPH_FLAG_DEFINED) & (ref_info->mask & HB_GLYPH_FLAG_DEFINED)) != (ref_info->mask & HB_GLYPH_FLAG_DEFINED))
+    if ((buf_info->mask & ~ref_info->mask & HB_GLYPH_FLAG_DEFINED))
       result |= HB_BUFFER_DIFF_FLAG_GLYPH_FLAGS_MISMATCH;
     if (contains && ref_info->codepoint == dottedcircle_glyph)
       result |= HB_BUFFER_DIFF_FLAG_DOTTED_CIRCLE_PRESENT;