Merge remote-tracking branch 'upstream/v1.1.x'

Conflicts:
	lib/matplotlib/__init__.py
	lib/matplotlib/backends/backend_svg.py
	lib/matplotlib/mathtext.py
	lib/matplotlib/rcsetup.py
	lib/matplotlib/tests/__init__.py
	lib/matplotlib/tests/baseline_images/test_image/imshow.png
	lib/matplotlib/tests/baseline_images/test_image/imshow.svg
	lib/matplotlib/tests/baseline_images/test_png/pngsuite.png
	lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout5.svg
	src/_macosx.m
	src/ft2font.cpp
	src/ft2font.h

Author: mdboom

doc/devel/coding_guide.rst

@@ -435,7 +435,7 @@ it::
   from matplotlib.testing.decorators import image_comparison
   import matplotlib.pyplot as plt
 
-  @image_comparison(baseline_images=['spines_axes_positions.png'])
+  @image_comparison(baseline_images=['spines_axes_positions'])
   def test_spines_axes_positions():
       # SF bug 2852168
       fig = plt.figure()
@@ -450,23 +450,25 @@ it::
       ax.xaxis.set_ticks_position('top')
       ax.spines['left'].set_color('none')
       ax.spines['bottom'].set_color('none')
-      fig.savefig('spines_axes_positions.png')
 
-The mechanism for comparing images is extremely simple -- it compares
-an image saved in the current directory with one from the Matplotlib
-sample_data repository. The correspondence is done by matching
-filenames, so ensure that:
+The first time this test is run, there will be no baseline image to
+compare against, so the test will fail.  Copy the output images (in
+this case `result_images/test_category/spines_axes_positions.*`) to
+the `baseline_images` tree in the source directory (in this case
+`lib/matplotlib/tests/baseline_images/test_category`) and put them
+under source code revision control (with `git add`).  When rerunning
+the tests, they should now pass.
 
- * The filename given to :meth:`~matplotlib.figure.Figure.savefig` is
-   exactly the same as the filename given to
-   :func:`~matplotlib.testing.decorators.image_comparison` in the
-   ``baseline_images`` argument.
+There are two optional keyword arguments to the `image_comparison`
+decorator:
 
- * The correct image gets added to the sample_data respository with
-   the name ``test_baseline_<IMAGE_FILENAME.png>``. (See
-   :ref:`sample-data` above for a description of how to add files to
-   the sample_data repository.)
+   - `extensions`: If you only wish to test some of the image formats
+     (rather than the default `png`, `svg` and `pdf` formats), pass a
+     list of the extensions to test.
 
+   - `tol`: This is the image matching tolerance, the default `1e-3`.
+     If some variation is expected in the image between runs, this
+     value may be adjusted.
 
 Known failing tests
 -------------------

lib/matplotlib/__init__.py

@@ -1002,27 +1002,35 @@ def tk_window_focus():
     'matplotlib.tests.test_simplification',
     'matplotlib.tests.test_mathtext',
     'matplotlib.tests.test_text',
-    'matplotlib.tests.test_tightlayout'
+    'matplotlib.tests.test_tightlayout',
+    'matplotlib.tests.test_delaunay',
+    'matplotlib.tests.test_legend'
     ]
 
 def test(verbosity=0):
     """run the matplotlib test suite"""
-    import nose
-    import nose.plugins.builtin
-    from .testing.noseclasses import KnownFailure
-    from nose.plugins.manager import PluginManager
-
-    # store the old values before overriding
-    plugins = []
-    plugins.append( KnownFailure() )
-    plugins.extend( [plugin() for plugin in nose.plugins.builtin.plugins] )
-
-    manager = PluginManager(plugins=plugins)
-    config = nose.config.Config(verbosity=verbosity, plugins=manager)
-
-    success = nose.run( defaultTest=default_test_modules,
-                        config=config,
-                        )
+    old_backend = rcParams['backend']
+    try:
+        use('agg')
+        import nose
+        import nose.plugins.builtin
+        from .testing.noseclasses import KnownFailure
+        from nose.plugins.manager import PluginManager
+
+        # store the old values before overriding
+        plugins = []
+        plugins.append( KnownFailure() )
+        plugins.extend( [plugin() for plugin in nose.plugins.builtin.plugins] )
+
+        manager = PluginManager(plugins=plugins)
+        config = nose.config.Config(verbosity=verbosity, plugins=manager)
+
+        success = nose.run( defaultTest=default_test_modules,
+                            config=config,
+                            )
+    finally:
+        if old_backend.lower() != 'agg':
+            use(old_backend)
 
     return success
 

lib/matplotlib/backends/backend_agg.py

@@ -157,7 +157,7 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath):
             # We pass '0' for angle here, since it will be rotated (in raster
             # space) in the following call to draw_text_image).
             font.set_text(s, 0, flags=flags)
-        font.draw_glyphs_to_bitmap()
+        font.draw_glyphs_to_bitmap(antialiased=rcParams['text.antialiased'])
 
         #print x, y, int(x), int(y), s
         self._renderer.draw_text_image(font.get_image(), int(x), int(y) + 1, angle, gc)

lib/matplotlib/backends/backend_svg.py

@@ -695,13 +695,13 @@ def draw_gouraud_triangle(self, gc, points, colors, trans):
         href = u'#GT%x' % self._n_gradients
         writer.element(
             u'use',
-            attrib={u'xlink:href': u'#%s' % href,
+            attrib={u'xlink:href': href,
                     u'fill': rgb2hex(avg_color),
                     u'fill-opacity': str(avg_color[-1])})
         for i in range(3):
             writer.element(
                 u'use',
-                attrib={u'xlink:href': u'#%s' % href,
+                attrib={u'xlink:href': href,
                         u'fill': u'url(#GR%x_%d)' % (self._n_gradients, i),
                         u'fill-opacity': u'1',
                         u'filter': u'url(#colorAdd)'})

lib/matplotlib/cbook.py

@@ -293,6 +293,9 @@ def disconnect(self, cid):
             except KeyError:
                 continue
             else:
+                for key, value in self._func_cid_map.items():
+                    if value == cid:
+                        del self._func_cid_map[key]
                 return
 
     def process(self, s, *args, **kwargs):

lib/matplotlib/mathtext.py

@@ -186,7 +186,8 @@ def render_glyph(self, ox, oy, info):
                               oy - info.metrics.ymin)
         else:
             info.font.draw_glyph_to_bitmap(
-                self.image, ox, oy - info.metrics.iceberg, info.glyph)
+                self.image, ox, oy - info.metrics.iceberg, info.glyph,
+                antialiased=rcParams['text.antialiased'])
 
     def render_rect_filled(self, x1, y1, x2, y2):
         if self.mode == 'bbox':

lib/matplotlib/rcsetup.py

@@ -423,6 +423,7 @@ def __call__(self, s):
     'text.dvipnghack'     : [None, validate_bool_maybe_none],
     'text.hinting'        : [True, validate_hinting],
     'text.hinting_factor' : [8, validate_int],
+    'text.antialiased'    : [True, validate_bool],
 
     # The following are deprecated and replaced by, e.g., 'font.style'
     #'text.fontstyle'      : ['normal', str],

lib/matplotlib/testing/decorators.py

@@ -7,6 +7,7 @@
 import matplotlib.tests
 import matplotlib.units
 from matplotlib import pyplot as plt
+from matplotlib import ft2font
 import numpy as np
 from matplotlib.testing.compare import comparable_formats, compare_images
 import warnings
@@ -64,7 +65,7 @@ def teardown_class(cls):
         matplotlib.units.registry.clear()
         matplotlib.units.registry.update(cls.original_units_registry)
         warnings.resetwarnings() #reset any warning filters set in tests
-        
+
     def test(self):
         self._func()
 
@@ -78,6 +79,18 @@ def cleanup(func):
         {'_func': func})
     return new_class
 
+def check_freetype_version(ver):
+    if ver is None:
+        return True
+
+    from distutils import version
+    if isinstance(ver, str):
+        ver = (ver, ver)
+    ver = [version.StrictVersion(x) for x in ver]
+    found = version.StrictVersion(ft2font.__freetype_version__)
+
+    return found >= ver[0] and found <= ver[1]
+
 class ImageComparisonTest(CleanupTest):
     @classmethod
     def setup_class(cls):
@@ -117,18 +130,25 @@ def do_test():
 
                     err = compare_images(expected_fname, actual_fname, self._tol, in_decorator=True)
 
-                    if not os.path.exists(expected_fname):
-                        raise ImageComparisonFailure(
-                            'image does not exist: %s' % expected_fname)
-
-                    if err:
-                        raise ImageComparisonFailure(
-                            'images not close: %(actual)s vs. %(expected)s '
-                            '(RMS %(rms).3f)'%err)
+                    try:
+                        if not os.path.exists(expected_fname):
+                            raise ImageComparisonFailure(
+                                'image does not exist: %s' % expected_fname)
+
+                        if err:
+                            raise ImageComparisonFailure(
+                                'images not close: %(actual)s vs. %(expected)s '
+                                '(RMS %(rms).3f)'%err)
+                    except ImageComparisonFailure:
+                        if not check_freetype_version(self._freetype_version):
+                            raise KnownFailureTest(
+                                "Mismatched version of freetype.  Test requires '%s', you have '%s'" %
+                                (self._freetype_version, ft2font.__freetype_version__))
+                        raise
 
                 yield (do_test,)
 
-def image_comparison(baseline_images=None, extensions=None, tol=1e-3):
+def image_comparison(baseline_images=None, extensions=None, tol=1e-3, freetype_version=None):
     """
     call signature::
 
@@ -149,6 +169,13 @@ def image_comparison(baseline_images=None, extensions=None, tol=1e-3):
         If *None*, default to all supported extensions.
 
         Otherwise, a list of extensions to test. For example ['png','pdf'].
+
+      *tol*: (default 1e-3)
+        The RMS threshold above which the test is considered failed.
+
+      *freetype_version*: str or tuple
+        The expected freetype version or range of versions for this
+        test to pass.
     """
 
     if baseline_images is None:
@@ -179,7 +206,9 @@ def compare_images_decorator(func):
             {'_func': func,
              '_baseline_images': baseline_images,
              '_extensions': extensions,
-             '_tol': tol})
+             '_tol': tol,
+             '_freetype_version': freetype_version})
+
         return new_class
     return compare_images_decorator
 

lib/matplotlib/tests/__init__.py

@@ -13,3 +13,4 @@ def setup():
     rcParams['font.family'] = 'Bitstream Vera Sans'
     rcParams['text.hinting'] = False
     rcParams['text.hinting_factor'] = 8
+    rcParams['text.antialiased'] = False