SC

Steve Chaplin · Steve Chaplin · commit 31f9b15924d9 · 2007-01-12T00:21:04.000Z
svn path=/trunk/matplotlib/; revision=2980
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2007-01-12 backend_cairo.py: fix draw_image() so that examples/image_demo.py
+           now looks correct - SC
+
 2007-01-11 Added Axes.xcorr and Axes.acorr to plot the cross
            correlation of x vs y or the autocorrelation of x.  pylab
            wrappers also provided.  See examples/xcorr_demo.py - JDH
diff --git a/lib/matplotlib/backends/backend_cairo.py b/lib/matplotlib/backends/backend_cairo.py
@@ -153,27 +153,23 @@ def draw_image(self, x, y, im, bbox):
         # bbox - not currently used
         if _debug: print '%s.%s()' % (self.__class__.__name__, _fn_name())
 
-        #if numx.which[0] == "numarray":
-        #    warnings.warn("draw_image() currently works for numpy, but not "
-        #                  "numarray")
-        #    return
-
-        #if not HAVE_CAIRO_NUMPY:
-        #    warnings.warn("cairo with Numeric support is required for "
-        #                  "draw_image()")
-        #    return
-
         im.flipud_out()
 
-        rows, cols, buf = im.buffer_argb32()  # ARGB32, but colors still wrong
-        X = numx.fromstring (buf, numx.UInt8)
-        X.shape = rows, cols, 4
+        if sys.byteorder == 'little':
+           rows, cols, str_ = im.buffer_bgra32()
+        else:
+           rows, cols, str_ = im.buffer_argb32()
 
-        # function does not pass a 'gc' so use renderer.ctx
-        ctx = self.ctx
-        #surface = cairo.ImageSurface.create_for_array (X)
+        X = numx.fromstring (str_, numx.UInt8)
         surface = cairo.ImageSurface.create_for_data (X, cairo.FORMAT_ARGB32,
                                                       rows, cols, rows*4)
+        # It would be simpler if im.buffer_*() returned a writeable buffer
+        # instead of a string, we could then bypass numx completely:
+        #surface = cairo.ImageSurface.create_for_data (
+        #              str_, cairo.FORMAT_ARGB32, rows, cols, rows*4)
+
+        # function does not pass a 'gc' so use renderer.ctx
+        ctx = self.ctx
         ctx.set_source_surface (surface, x, y)
         ctx.paint()
 
