Fixed incorrect bug fix in ScalarMappable.to_rgba()

efiring · efiring · commit 1e2b86f09174 · 2006-02-22T18:21:15.000Z
svn path=/trunk/matplotlib/; revision=2073
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+2006-02-22 Fixed bug in ScalarMappable.to_rgba() reported by
+           Ray Jones, and fixed incorrect fix found by Jeff
+           Whitaker - EF
+
 ===============================================================
 2006-02-22 Released 0.87
 
diff --git a/lib/matplotlib/cm.py b/lib/matplotlib/cm.py
@@ -48,8 +48,10 @@ def set_colorbar(self, im, ax):
         self.colorbar = im, ax
 
     def to_rgba(self, x, alpha=1.0):
-        # assume normalized rgb, rgba
-        if len(x.shape)>2: return x
+        '''Return a normalized rgba array corresponding to x.
+        If x is already an rgb or rgba array, return it unchanged.
+        '''
+        if hasattr(x, 'shape') and len(x.shape)>2: return x
         x = ma.asarray(x)
         x = self.norm(x)
         x = self.cmap(x, alpha)
