fixed from_images to respect stride

jdh2358 · jdh2358 · commit b2b80fe026ce · 2008-11-09T13:16:39.000Z
svn path=/trunk/matplotlib/; revision=6381
diff --git a/examples/pylab_examples/figimage_demo.py b/examples/pylab_examples/figimage_demo.py
@@ -12,12 +12,12 @@
 Z.shape = 100,100
 Z[:,50:] = 1.
 
-im1 = plt.figimage(Z, xo=50, yo=0, cmap=cm.jet, origin='upper')
-im2 = plt.figimage(Z, xo=100, yo=100, alpha=.8, cmap=cm.jet, origin='upper')
+im1 = plt.figimage(Z, xo=50, yo=0, cmap=cm.jet, origin='lower')
+im2 = plt.figimage(Z, xo=100, yo=100, alpha=.8, cmap=cm.jet, origin='lower')
 
-fig.savefig('figimage_demo.png')
-fig.savefig('figimage_demo.svg')
-fig.savefig('figimage_demo.pdf')
+#fig.savefig('figimage_demo.png')
+#fig.savefig('figimage_demo.svg')
+#fig.savefig('figimage_demo.pdf')
 plt.show()
 
 
diff --git a/examples/pylab_examples/layer_images.py b/examples/pylab_examples/layer_images.py
@@ -25,15 +25,17 @@ def func3(x,y):
 
 xmin, xmax, ymin, ymax = amin(x), amax(x), amin(y), amax(y)
 extent = xmin, xmax, ymin, ymax
+fig = plt.figure(frameon=False)
+
 Z1 = array(([0,1]*4 + [1,0]*4)*4); Z1.shape = 8,8  # chessboard
 im1 = imshow(Z1, cmap=cm.gray, interpolation='nearest',
-             extent=extent, origin='lower')
+             extent=extent)
 hold(True)
 
 Z2 = func3(X, Y)
 
 im2 = imshow(Z2, cmap=cm.jet, alpha=.9, interpolation='bilinear',
-             extent=extent, origin='lower')
+             extent=extent)
 #axis([xmin, xmax, ymin, ymax])
 
 
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -1536,11 +1536,6 @@ def draw(self, renderer=None, inframe=False):
             ims = [(im.make_image(mag),0,0)
                    for im in self.images if im.get_visible()]
 
-            #flip the images if their origin is "upper"
-            for _im, (im,_,_) in zip(self.images, ims):
-                if _im.origin=="upper":
-                    im.flipud_out()
-
 
             l, b, r, t = self.bbox.extents
             width = mag*((round(r) + 0.5) - (round(l) - 0.5))
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -753,11 +753,6 @@ def draw(self, renderer):
             ims = [(im.make_image(mag), im.ox*mag, im.oy*mag)
                    for im in self.images]
 
-            for _im, (im,_,_) in zip(self.images, ims):
-                if _im.origin=="upper":
-                    im.flipud_out()
-
-
             im = _image.from_images(self.bbox.height * mag,
                                     self.bbox.width * mag,
                                     ims)
diff --git a/src/_image.cpp b/src/_image.cpp
@@ -104,7 +104,9 @@ Image::flipud_out(const Py::Tuple& args) {
 
   args.verify_length(0);
   int stride = rbufOut->stride();
+  //std::cout << "flip before: " << rbufOut->stride() << std::endl;
   rbufOut->attach(bufferOut, colsOut, rowsOut, -stride);
+  //std::cout << "flip after: " << rbufOut->stride() << std::endl;
   return Py::Object();
 }
 
@@ -744,18 +746,24 @@ _image_module::from_images(const Py::Tuple& args) {
 
 
   rb.clear(agg::rgba(1, 1, 1, 1));
-
   for (size_t imnum=0; imnum< N; imnum++) {
     tup = Py::Tuple(tups[imnum]);
     Image* thisim = static_cast<Image*>(tup[0].ptr());
     ox = Py::Int(tup[1]);
     oy = Py::Int(tup[2]);
-
+    bool isflip = (thisim->rbufOut->stride())<0;
+    //std::cout << "from images " << isflip << "; stride=" << thisim->rbufOut->stride() << std::endl;
     size_t ind=0;
     for (size_t j=0; j<thisim->rowsOut; j++) {
       for (size_t i=0; i<thisim->colsOut; i++) {
 	thisx = i+ox;
-	thisy = j+oy;
+
+	if (isflip)
+	  thisy = thisim->rowsOut - j + oy;
+	else
+	  thisy = j+oy;
+
+
 	if (thisx>=numcols || thisy>=numrows) {
 	  ind +=4;
 	  continue;
