Merge branch 'issue_2150'

tacaswell · tacaswell · commit 899f11d2e920 · 2014-05-18T18:02:39.000-04:00
Conflicts:
	CHANGELOG
diff --git a/CHANGELOG b/CHANGELOG
@@ -29,6 +29,11 @@
 2014-03-27 Added tests for pie ccw parameter. Removed pdf and svg images
            from tests for pie linewidth parameter.
 
+2014-03-24 Changed the behaviour of axes to not ignore leading or trailing
+           patches of height 0 (or width 0) while calculating the x and y
+           axis limits. Patches having both height == 0 and width == 0 are
+           ignored.
+
 2014-03-24 Added bool kwarg (manage_xticks) to boxplot to enable/disable
            the managemnet of the xlimits and ticks when making a boxplot.
            Default in True which maintains current behavior by default.
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -1556,8 +1556,10 @@ def _update_patch_limits(self, patch):
         # the auto-scaling
 
         # cannot check for '==0' since unitized data may not compare to zero
+        # issue #2150 - we update the limits if patch has non zero width
+        # or height.
         if (isinstance(patch, mpatches.Rectangle) and
-            ((not patch.get_width()) or (not patch.get_height()))):
+                ((not patch.get_width()) and (not patch.get_height()))):
             return
         vertices = patch.get_path().vertices
         if vertices.size > 0:
