Fixed bug in implementation of contour 'extend' kw

efiring · efiring · commit f8b9997f8f1b · 2006-12-23T02:18:00.000Z
svn path=/trunk/matplotlib/; revision=2945
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -428,7 +428,7 @@ def _mesh(self):
 
     def _locate(self, x):
         '''
-        Given a possible set of color date values, return the ones
+        Given a possible set of color data values, return the ones
         within range, together with their corresponding colorbar
         data coordinates.
         '''
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -628,9 +628,9 @@ def _contour_args(self, *args):
         #                             + "with use of 'extend' kwarg")
         self._levels = list(self.levels)
         if self.extend in ('both', 'min'):
-            self._levels.insert(0, self.zmin - 1)
+            self._levels.insert(0, min(self.levels[0],self.zmin) - 1)
         if self.extend in ('both', 'max'):
-            self._levels.append(self.zmax + 1)
+            self._levels.append(max(self.levels[-1],self.zmax) + 1)
         self._levels = asarray(self._levels)
         self.vmin = amin(self.levels)  # alternative would be self.layers
         self.vmax = amax(self.levels)
