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

[Behdad Esfahbod]

 src/hb-ot-layout.cc      |    6 +++---
 src/test-ot-color.cc     |    2 +-
 test/api/test-ot-color.c |    2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 07ec792212063851ee41eae33792d3d90d31e6a1
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Nov 1 10:31:12 2018 -0400

    Warning fix

diff --git a/src/test-ot-color.cc b/src/test-ot-color.cc
index 1e492e66..4b10e017 100644
--- a/src/test-ot-color.cc
+++ b/src/test-ot-color.cc
@@ -90,7 +90,7 @@ png_dump (hb_face_t *face, unsigned int face_index)
   unsigned int upem = hb_face_get_upem (face);
   unsigned int blob_length = 0;
   unsigned int strike = 0;
-  for (unsigned int ppem = 1; ppem <= upem; ppem++)
+  for (unsigned int ppem = 1; ppem < upem; ppem++)
   {
     hb_font_set_ppem (font, ppem, ppem);
     hb_blob_t *blob = hb_ot_color_glyph_reference_png (font, sample_glyph_id);
commit c32280b30fb3844addda31a0d97ae7cb55ef07d2
Author: Ebrahim Byagowi <ebrahim at gnu.org>
Date:   Thu Nov 1 15:31:14 2018 +0330

    [ot-layout] minor

diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index e135e4a9..e1b6b2e3 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -38,9 +38,9 @@
 #include "hb-ot-layout-gsub-table.hh"
 #include "hb-ot-layout-gpos-table.hh"
 
-// Just so we compile them; unused otherwise:
-#include "hb-ot-layout-base-table.hh"
-#include "hb-ot-layout-jstf-table.hh"
+#include "hb-ot-layout-base-table.hh" // Just so we compile them; unused otherwise
+#include "hb-ot-layout-jstf-table.hh" // Just so we compile them; unused otherwise
+
 #include "hb-ot-kern-table.hh"
 #include "hb-ot-name-table.hh"
 
commit cad90be4ea56a85ddc084f86f36dd7129850f6d7
Author: Ebrahim Byagowi <ebrahim at gnu.org>
Date:   Thu Nov 1 13:39:06 2018 +0330

    [test] minor

diff --git a/test/api/test-ot-color.c b/test/api/test-ot-color.c
index e93f5d7b..fdea1625 100644
--- a/test/api/test-ot-color.c
+++ b/test/api/test-ot-color.c
@@ -28,8 +28,6 @@
 #include "hb-test.h"
 
 #include <hb-ot.h>
-#include <stdlib.h>
-#include <stdio.h>
 
 /* Unit tests for hb-ot-color.h */