Used masked val, not values

alanhdu · alanhdu · commit 9c3623a0545f · 2015-02-28T20:34:25.000-05:00
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -1195,7 +1195,7 @@ def inverse(self, value):
 
         if cbook.iterable(value):
             val = ma.asarray(value)
-            return ma.power(value, 1. / gamma) * (vmax - vmin) + vmin
+            return ma.power(val, 1. / gamma) * (vmax - vmin) + vmin
         else:
             return pow(value, 1. / gamma) * (vmax - vmin) + vmin
 
@@ -1550,8 +1550,7 @@ def hillshade(self, elevation, vert_exag=1, dx=1, dy=1, fraction=1.):
         aspect = np.arctan2(-dy, -dx)
         slope = 0.5 * np.pi - np.arctan(np.hypot(dx, dy))
         intensity = (np.sin(alt) * np.sin(slope) +
-                     np.cos(alt) * np.cos(slope) *
-                     np.cos(az - aspect))
+                     np.cos(alt) * np.cos(slope) * np.cos(az - aspect))
 
         # Apply contrast stretch
         imin, imax = intensity.min(), intensity.max()
