added argb32 image support

jdh2358 · jdh2358 · commit 3879436c088a · 2004-11-04T15:59:19.000Z
svn path=/trunk/matplotlib/; revision=662
diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
 # numarray.  You can build the image module with either Numeric or
 # numarray or both.  By default, matplotlib will build support for
 # whatever array packages you have installed.
-BUILD_IMAGE = 0
+BUILD_IMAGE = 1
 
 # Build the antigrain geometry toolkit.  Agg makes heavy use of
 # templates, so it probably requires a fairly recent compiler to build
@@ -23,14 +23,14 @@
 BUILD_AGG = 1
 
 # Render Agg to the GTK canvas
-BUILD_GTKAGG       = 0
-#BUILD_GTKAGG       = 'auto'
+#BUILD_GTKAGG       = 0
+BUILD_GTKAGG       = 'auto'
 
 # build TK GUI with Agg renderer ; requires Tkinter Python extension
 # and Tk includes
 # Use False or 0 if you don't want to build
-BUILD_TKAGG        = 0
-#BUILD_TKAGG        = 'auto'
+#BUILD_TKAGG        = 0
+BUILD_TKAGG        = 'auto'
 
 # build a small extension to manage the focus on win32 platforms.
 #BUILD_WINDOWING        = 0
diff --git a/src/_image.cpp b/src/_image.cpp
@@ -26,7 +26,7 @@
 #include "agg_scanline_bin.h"
 #include "agg_scanline_u.h"
 #include "agg_renderer_scanline.h"
-
+#include "util/agg_color_conv_rgb8.h"
 #include "_image.h"
 #include "mplutils.h"
 
@@ -200,6 +200,38 @@ Image::as_str(const Py::Tuple& args) {
 }
 
 
+char Image::buffer_argb32__doc__[] = 
+"buffer = buffer_argb32)"
+"\n"
+"Return the image buffer as agbr32\n"
+;
+Py::Object 
+Image::buffer_argb32(const Py::Tuple& args) {
+  //"Return the image object as argb32";
+
+  _VERBOSE("RendererAgg::buffer_argb32");
+  
+  args.verify_length(0);    
+  int row_len = colsOut * 4;
+
+  unsigned char* buf_tmp = new unsigned char[row_len * rowsOut];
+  if (buf_tmp ==NULL) 
+    throw Py::MemoryError("RendererAgg::buffer_argb32 could not allocate memory");
+  
+  agg::rendering_buffer rtmp;
+  rtmp.attach(buf_tmp, colsOut, rowsOut, row_len);
+  
+  color_conv(&rtmp, rbufOut, agg::color_conv_rgba32_to_argb32());
+  
+  
+  //todo: how to do this with native CXX
+  PyObject* o = Py_BuildValue("s#", buf_tmp, row_len * rowsOut);
+  delete [] buf_tmp;
+  return Py::asObject(o);
+
+
+}
+
 char Image::reset_matrix__doc__[] = 
 "reset_matrix()"
 "\n"
@@ -583,6 +615,7 @@ Image::init_type() {
   add_varargs_method( "apply_scaling",	&Image::apply_scaling, Image::apply_scaling__doc__);
   add_varargs_method( "apply_translation", &Image::apply_translation, Image::apply_translation__doc__);
   add_varargs_method( "as_str", &Image::as_str, Image::as_str__doc__);
+  add_varargs_method( "buffer_argb32", &Image::buffer_argb32, Image::buffer_argb32__doc__);
   add_varargs_method( "get_aspect", &Image::get_aspect, Image::get_aspect__doc__);
   add_varargs_method( "get_interpolation", &Image::get_interpolation, Image::get_interpolation__doc__);
   add_varargs_method( "get_size", &Image::get_size, Image::get_size__doc__);
diff --git a/src/_image.h b/src/_image.h
@@ -27,6 +27,7 @@ class Image : public Py::PythonExtension<Image> {
   Py::Object apply_scaling(const Py::Tuple& args);
   Py::Object apply_translation(const Py::Tuple& args);
   Py::Object as_str(const Py::Tuple& args);
+  Py::Object buffer_argb32(const Py::Tuple& args);
   Py::Object reset_matrix(const Py::Tuple& args);
   Py::Object resize(const Py::Tuple& args);
   Py::Object get_aspect(const Py::Tuple& args);
@@ -61,6 +62,7 @@ class Image : public Py::PythonExtension<Image> {
   static char apply_scaling__doc__[];
   static char apply_translation__doc__[];
   static char as_str__doc__[];
+  static char buffer_argb32__doc__[];
   static char reset_matrix__doc__[];
   static char resize__doc__[];
   static char get_aspect__doc__[];
