[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Behdad Esfahbod]

 src/hb-buffer.cc  |    2 +-
 util/hb-subset.cc |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d49ae5154e0b069ffa2605ea3f66abb583319ec8
Author: Ebrahim Byagowi <ebrahim at gnu.org>
Date:   Tue Feb 6 13:48:10 2018 +0330

    Fix hb-buffer logic error

diff --git a/src/hb-buffer.cc b/src/hb-buffer.cc
index 7fb000dd..c2463612 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 & HB_GLYPH_FLAG_DEFINED) & (ref_info->mask & HB_GLYPH_FLAG_DEFINED)) != (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;
commit 70e13ade81a2a09e17d75bdc7e3fe45d8ec9e2c6
Author: Ebrahim Byagowi <ebrahim at gnu.org>
Date:   Tue Feb 6 13:20:38 2018 +0330

    [subset] Fix Windows issue on endlines (#756)

diff --git a/util/hb-subset.cc b/util/hb-subset.cc
index ef70a2dc..27398ab0 100644
--- a/util/hb-subset.cc
+++ b/util/hb-subset.cc
@@ -57,7 +57,7 @@ struct subset_consumer_t
     unsigned int data_length;
     const char* data = hb_blob_get_data (blob, &data_length);
 
-    FILE *fp_out = fopen(output_file, "w");
+    FILE *fp_out = fopen(output_file, "wb");
     if (fp_out == nullptr) {
       fprintf(stderr, "Unable to open output file\n");
       return false;