Fixed failing bbox_inches='tight' case when a contour collection is empty.

pelson · mdboom · commit 98e37e892f99 · 2013-05-03T10:40:41.000-04:00
Conflicts:
	lib/matplotlib/tests/test_collections.py
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -183,10 +183,13 @@ def get_datalim(self, transData):
             # get_path_collection_extents handles nan but not masked arrays
         offsets.shape = (-1, 2)                     # Make it Nx2
 
-        result = mpath.get_path_collection_extents(
-            transform.frozen(), paths, self.get_transforms(),
-            offsets, transOffset.frozen())
-        result = result.inverse_transformed(transData)
+        if paths:
+            result = mpath.get_path_collection_extents(
+                transform.frozen(), paths, self.get_transforms(),
+                offsets, transOffset.frozen())
+            result = result.inverse_transformed(transData)
+        else:
+            result = transforms.Bbox([[0, 0], [0, 0]])
         return result
 
     def get_window_extent(self, renderer):
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
@@ -747,7 +747,11 @@ def __init__(self, points, **kwargs):
         :meth:`from_bounds` and :meth:`from_extents`.
         """
         BboxBase.__init__(self, **kwargs)
-        self._points = np.asarray(points, np.float_)
+        points = np.asarray(points, np.float_)
+        if points.shape != (2, 2):
+            raise ValueError('Bbox points must be of the form ' 
+                             '"[[x0, y0], [x1, y1]]".')
+        self._points = points
         self._minpos = np.array([0.0000001, 0.0000001])
         self._ignore = True
         # it is helpful in some contexts to know if the bbox is a
