Bug 1215428 - Update harfbuzz to release 1.0.6. r=jdaggett
authorJonathan Kew <jkew@mozilla.com>
Mon, 26 Oct 2015 13:38:12 +0000
changeset 269518 18d52e7a0d80bda0507dca823806204b9595f2e9
parent 269517 11d88c9683e58c28f417a9122c2101ea66edeba9
child 269519 8d96502842a277b9bed903c4e29aa78bd41f8b43
push id29584
push userkwierso@gmail.com
push dateMon, 26 Oct 2015 21:33:14 +0000
treeherdermozilla-central@6c7c983bce46 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjdaggett
bugs1215428
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1215428 - Update harfbuzz to release 1.0.6. r=jdaggett
gfx/harfbuzz/src/hb-ft.cc
gfx/harfbuzz/src/hb-ot-font.cc
gfx/harfbuzz/src/hb-version.h
--- a/gfx/harfbuzz/src/hb-ft.cc
+++ b/gfx/harfbuzz/src/hb-ft.cc
@@ -79,17 +79,17 @@ static hb_ft_font_t *
   hb_ft_font_t *ft_font = (hb_ft_font_t *) calloc (1, sizeof (hb_ft_font_t));
 
   if (unlikely (!ft_font))
     return NULL;
 
   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;
 }
 
 static void
 _hb_ft_font_destroy (hb_ft_font_t *ft_font)
 {
   if (ft_font->unref)
--- a/gfx/harfbuzz/src/hb-ot-font.cc
+++ b/gfx/harfbuzz/src/hb-ot-font.cc
@@ -54,17 +54,17 @@ struct hb_ot_face_metrics_accelerator_t
 
     hb_blob_t *_hea_blob = OT::Sanitizer<OT::_hea>::sanitize (face->reference_table (_hea_tag));
     const OT::_hea *_hea = OT::Sanitizer<OT::_hea>::lock_instance (_hea_blob);
     this->num_advances = _hea->numberOfLongMetrics;
     hb_blob_destroy (_hea_blob);
 
     this->blob = OT::Sanitizer<OT::_mtx>::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);
       this->blob = hb_blob_get_empty ();
     }
     this->table = OT::Sanitizer<OT::_mtx>::lock_instance (this->blob);
   }
 
--- a/gfx/harfbuzz/src/hb-version.h
+++ b/gfx/harfbuzz/src/hb-version.h
@@ -33,19 +33,19 @@
 
 #include "hb-common.h"
 
 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) <= \
 	 HB_VERSION_MAJOR*10000+HB_VERSION_MINOR*100+HB_VERSION_MICRO)
 
 
 void
 hb_version (unsigned int *major,