added image blending

jdh2358 · jdh2358 · commit de96c0e2205e · 2004-06-22T16:55:10.000Z
svn path=/trunk/matplotlib/; revision=354
diff --git a/examples/pcolor_demo2.py b/examples/pcolor_demo2.py
@@ -20,8 +20,11 @@ def func3(x,y):
 cmap = ColormapJet(500)
 
 ax = subplot(111)
-imshow(Z, cmap)
-ax.set_image_extent(-3, 3, -3, 3)
+im = imshow(Z, cmap)
+#im.set_interpolation('nearest')
+im.set_interpolation('bicubic')
+#im.set_interpolation('bilinear')
+#ax.set_image_extent(-3, 3, -3, 3)
 savefig('pcolor_demo2')
 show()
 
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -887,10 +887,26 @@ RendererAgg::draw_image(const Py::Tuple& args) {
   
   
   //todo: handle x and y
-  agg::rect r(0, 0, image->colsOut, image->rowsOut);
-  
-  rendererBase->copy_from(*image->rbufOut, &r, x, y);
-  
+  //agg::rect r(0, 0, image->colsOut, image->rowsOut);
+  //rendererBase->copy_from(*image->rbufOut, &r, x, y);
+  size_t ind=0;
+  size_t thisx, thisy;
+  for (size_t j=0; j<image->rowsOut; j++) {
+    for (size_t i=0; i<image->colsOut; i++) {
+      thisx = i+x; 
+      thisy = j+y; 
+      if (thisx<0 || thisx>=width)  continue;
+      if (thisy<0 || thisy>=height) continue;
+      pixfmt::color_type p;
+      p.r = *(image->bufferOut+ind++);
+      p.g = *(image->bufferOut+ind++);
+      p.b = *(image->bufferOut+ind++);
+      p.a = *(image->bufferOut+ind++);
+
+      pixFmt->blend_pixel(thisx, thisy, p, p.a);
+    }
+  }
+
   return Py::Object();
   
 }
