Merge remote-tracking branch 'remotes/origin/v1.0.x'

astropy-buildbot · astropy-buildbot · commit 79984f7020a3 · 2011-03-22T18:55:04.000-07:00
diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
@@ -184,3 +184,11 @@ def test_mathtext_font_stixsans():
     fig.savefig('mathtext_font_stixsans')
 
     matplotlib.rcParams['mathtext.fontset'] = 'cm'
+
+def test_fontinfo():
+    import matplotlib.font_manager as font_manager
+    import matplotlib.ft2font as ft2font
+    fontpath = font_manager.findfont("Bitstream Vera Sans")
+    font = ft2font.FT2Font(fontpath)
+    table = font.get_sfnt_table("head")
+    assert table['version'] == (1, 0)
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -6,8 +6,12 @@
 
 #include "numpy/arrayobject.h"
 
-#define FIXED_MAJOR(val) (*((short *) &val+1))
-#define FIXED_MINOR(val) (*((short *) &val+0))
+/*
+ By definition, FT_FIXED as 2 16bit values stored in a single long.
+ We cast to long to ensure the correct Py::Int convertor is called
+ */
+#define FIXED_MAJOR(val) (long) ((val & 0xffff000) >> 16)
+#define FIXED_MINOR(val) (long) (val & 0xffff)
 
 /**
  To improve the hinting of the fonts, this code uses a hack
