From d4e4f3b6aa50d5a79db5ea34b78c0336f89f00d8 Mon Sep 17 00:00:00 2001 From: Jonathan Kew Date: Mon, 26 Oct 2015 13:38:12 +0000 Subject: [PATCH] Bug 1215428 - Update harfbuzz to release 1.0.6. r=jdaggett --- gfx/harfbuzz/src/hb-ft.cc | 2 +- gfx/harfbuzz/src/hb-ot-font.cc | 2 +- gfx/harfbuzz/src/hb-version.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gfx/harfbuzz/src/hb-ft.cc b/gfx/harfbuzz/src/hb-ft.cc index b695f81ab084..2b11882961cb 100644 --- a/gfx/harfbuzz/src/hb-ft.cc +++ b/gfx/harfbuzz/src/hb-ft.cc @@ -84,7 +84,7 @@ _hb_ft_font_create (FT_Face ft_face, bool unref) ft_font->ft_face = ft_face; ft_font->unref = unref; - ft_font->load_flags = FT_LOAD_DEFAULT; + ft_font->load_flags = FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING; return ft_font; } diff --git a/gfx/harfbuzz/src/hb-ot-font.cc b/gfx/harfbuzz/src/hb-ot-font.cc index 3102784e2cad..69d2503abbf5 100644 --- a/gfx/harfbuzz/src/hb-ot-font.cc +++ b/gfx/harfbuzz/src/hb-ot-font.cc @@ -59,7 +59,7 @@ struct hb_ot_face_metrics_accelerator_t this->blob = OT::Sanitizer::sanitize (face->reference_table (_mtx_tag)); if (unlikely (!this->num_advances || - 2 * (this->num_advances + this->num_metrics) < hb_blob_get_length (this->blob))) + 2 * (this->num_advances + this->num_metrics) > hb_blob_get_length (this->blob))) { this->num_metrics = this->num_advances = 0; hb_blob_destroy (this->blob); diff --git a/gfx/harfbuzz/src/hb-version.h b/gfx/harfbuzz/src/hb-version.h index eb1ddbe2c1c7..bd9ac3d1fc2c 100644 --- a/gfx/harfbuzz/src/hb-version.h +++ b/gfx/harfbuzz/src/hb-version.h @@ -38,9 +38,9 @@ HB_BEGIN_DECLS #define HB_VERSION_MAJOR 1 #define HB_VERSION_MINOR 0 -#define HB_VERSION_MICRO 5 +#define HB_VERSION_MICRO 6 -#define HB_VERSION_STRING "1.0.5" +#define HB_VERSION_STRING "1.0.6" #define HB_VERSION_ATLEAST(major,minor,micro) \ ((major)*10000+(minor)*100+(micro) <= \