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

[Behdad Esfahbod]

 src/hb-ot-layout.cc |   18 ++++++++++++------
 src/hb-private.hh   |    1 +
 2 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 29393884b9f045460fb65d6ad10a94461ba93430
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Apr 26 10:35:23 2016 -0700

    Annotate blacklisted fonts with their sha1sum

diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index 25a35b4..29749bc 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -70,12 +70,18 @@ _hb_ot_layout_create (hb_face_t *face)
     unsigned int gsub_len = hb_blob_get_length (layout->gsub_blob);
     unsigned int gpos_len = hb_blob_get_length (layout->gpos_blob);
     if (0
-      || (442 == gdef_len && 42038 == gpos_len && 2874 == gsub_len) /* Windows 7? timesi.ttf */
-      || (430 == gdef_len && 40662 == gpos_len && 2874 == gsub_len) /* Windows 7? timesbi.ttf */
-      || (442 == gdef_len && 39116 == gpos_len && 2874 == gsub_len) /* Windows 7 timesi.ttf */
-      || (430 == gdef_len && 39374 == gpos_len && 2874 == gsub_len) /* Windows 7 timesbi.ttf */
-      || (490 == gdef_len && 41638 == gpos_len && 3046 == gsub_len) /* OS X 10.11.3 Times New Roman Italic.ttf */
-      || (478 == gdef_len && 41902 == gpos_len && 3046 == gsub_len) /* OS X 10.11.3 Times New Roman Bold Italic.ttf */
+      /* sha1sum:c5ee92f0bca4bfb7d06c4d03e8cf9f9cf75d2e8a Windows 7? timesi.ttf */
+      || (442 == gdef_len && 42038 == gpos_len && 2874 == gsub_len)
+      /* sha1sum:37fc8c16a0894ab7b749e35579856c73c840867b Windows 7? timesbi.ttf */
+      || (430 == gdef_len && 40662 == gpos_len && 2874 == gsub_len)
+      /* sha1sum:19fc45110ea6cd3cdd0a5faca256a3797a069a80 Windows 7 timesi.ttf */
+      || (442 == gdef_len && 39116 == gpos_len && 2874 == gsub_len)
+      /* sha1sum:6d2d3c9ed5b7de87bc84eae0df95ee5232ecde26 Windows 7 timesbi.ttf */
+      || (430 == gdef_len && 39374 == gpos_len && 2874 == gsub_len)
+      /* sha1sum:8583225a8b49667c077b3525333f84af08c6bcd8 OS X 10.11.3 Times New Roman Italic.ttf */
+      || (490 == gdef_len && 41638 == gpos_len && 3046 == gsub_len)
+      /* sha1sum:ec0f5a8751845355b7c3271d11f9918a966cb8c9 OS X 10.11.3 Times New Roman Bold Italic.ttf */
+      || (478 == gdef_len && 41902 == gpos_len && 3046 == gsub_len)
     )
     {
       /* In certain versions of Times New Roman Italic and Bold Italic,
commit 14bb4a56971fd45063cd6c1288d911627088abb2
Merge: 1c625df 5069062
Author: Sascha Brawer <sascha at brawer.ch>
Date:   Tue Apr 26 11:38:16 2016 +0200

    Merge pull request #245 from KonstantinRitt/fixes/ce
    
    Unbreak build on Windows CE

commit 5069062d0a9342bb716eebf3ddc1efad91924caa
Author: Konstantin Ritt <ritt.ks at gmail.com>
Date:   Tue Apr 26 12:02:26 2016 +0400

    Unbreak build on Windows CE
    
    0475ef2f97e3035a2eea9a0f96031331e07e8e29 broke the build by using
    vsnprintf(), which is not defined on Windows CE

diff --git a/src/hb-private.hh b/src/hb-private.hh
index 179e4e9..d58a695 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -169,6 +169,7 @@ extern "C" void  hb_free_impl(void *ptr);
 #  if defined(_WIN32_WCE)
      /* Some things not defined on Windows CE. */
 #    define strdup _strdup
+#    define vsnprintf _vsnprintf
 #    define getenv(Name) NULL
 #    if _WIN32_WCE < 0x800
 #      define setlocale(Category, Locale) "C"