fixed imaging size problems

jdh2358 · jdh2358 · commit b1b1bcc4b4a7 · 2004-06-07T12:34:41.000Z
svn path=/trunk/matplotlib/; revision=331
diff --git a/examples/image_demo.py b/examples/image_demo.py
@@ -31,6 +31,6 @@ def bivariate_normal(X, Y, sigmax=1.0, sigmay=1.0,
 im.set_interpolation('bilinear')
 
 axis('off')
-#savefig('test')
+savefig('image_demo')
 show()
 
diff --git a/examples/image_demo2.py b/examples/image_demo2.py
@@ -30,6 +30,6 @@
     ylabel('density')
     set(gca(), 'xticklabels', [])
 
-#savefig('image_demo2')
+savefig('image_demo2')
 show()
 
diff --git a/examples/pcolor_demo.py b/examples/pcolor_demo.py
@@ -21,6 +21,7 @@ def func3(x,y):
 Z = func3(X, Y)
 pcolor(X, Y, Z, shading='flat')
 colorbar()
+savefig('pcolor_demo')
 show()
 
     
diff --git a/examples/pcolor_demo2.py b/examples/pcolor_demo2.py
@@ -22,7 +22,7 @@ def func3(x,y):
 ax = subplot(111)
 imshow(Z, cmap)
 ax.set_image_extent(-3, 3, -3, 3)
-#savefig('pcolor_demo2')
+savefig('pcolor_demo2')
 show()
 
     
diff --git a/examples/pcolor_small.py b/examples/pcolor_small.py
@@ -1,7 +1,12 @@
 from matplotlib.matlab import *
 
-Z = rand(6,6)
+#Z = arange(60)
+#Z.shape = 6,10
+#Z.shape = 10,6
+#print Z
+Z = rand(10,6)
 
 c = pcolor(Z)
 c.set_linewidth(4)
+savefig('pcolor_small')
 show()
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -886,7 +886,7 @@ RendererAgg::draw_image(const Py::Tuple& args) {
   
   
   //todo: handle x and y
-  agg::rect r(0, 0, image->rowsOut, image->colsOut);
+  agg::rect r(0, 0, image->colsOut, image->rowsOut);
   
   rendererBase->copy_from(*image->rbufOut, &r, x, y);
   
diff --git a/src/_image.cpp b/src/_image.cpp
@@ -181,13 +181,13 @@ Image_resize(ImageObject *image, PyObject* args) {
   if (!PyArg_ParseTuple(args, "ii", &numcols, &numrows))
     return NULL;
   
-  image->colsOut  = numcols;
+  image->colsOut = numcols;
   image->rowsOut = numrows;
   
   size_t NUMBYTES(numrows * numcols * image->BPP);
   agg::int8u *buffer = new agg::int8u[NUMBYTES];  
   image->rbufOut = new agg::rendering_buffer;
-  image->rbufOut->attach(buffer, numrows, numcols, numrows * image->BPP);
+  image->rbufOut->attach(buffer, numcols, numrows, numcols * image->BPP);
   
   // init the output rendering/rasterizing stuff
   pixfmt pixf(*image->rbufOut);
