Changeset 652

Timestamp:

02/19/08 06:28:20 (9 months ago)

Author:

artem

Message:

implemented Image open method :

im = Image.open("map.png")

Files:

• trunk/bindings/python/mapnik_image.cpp (modified) (4 diffs)

trunk/bindings/python/mapnik_image.cpp

@@ -36 +36 @@
 #include <mapnik/jpeg_io.hpp>
 #include <mapnik/png_io.hpp>
+#include <mapnik/image_reader.hpp>
 #include <sstream>
 
 using mapnik::Image32;
+using mapnik::ImageReader;
+using mapnik::get_image_reader;
+using mapnik::type_from_filename;
 using namespace boost::python;
 using mapnik::save_to_file;
@@ -63 +67 @@
 void (*save_to_file2)( mapnik::Image32 const&, std::string const&) = mapnik::save_to_file;
 
+boost::shared_ptr<Image32> open_from_file(std::string const& filename)
+{
+   std::auto_ptr<ImageReader> reader(get_image_reader(filename,type_from_filename(filename)));
+   if (reader.get())
+   {
+      boost::shared_ptr<Image32> image_ptr(new Image32(reader->width(),reader->height()));
+      reader->read(0,0,image_ptr->data());
+      return image_ptr;
+   }
+   throw mapnik::ImageReaderException("FIXME: " + filename);  
+}
+
 void blend (Image32 & im, unsigned x, unsigned y, Image32 const& im2, float opacity)
 {
@@ -71 +87 @@
 {
     using namespace boost::python;
-    class_<Image32>("Image","This class represents a 32 bit RGBA image.",init<int,int>())
+    class_<Image32,boost::shared_ptr<Image32> >("Image","This class represents a 32 bit RGBA image.",init<int,int>())
        .def("width",&Image32::width)
        .def("height",&Image32::height)
@@ -83 +99 @@
        .def("save", save_to_file1)
        .def("save", save_to_file2)
+       .def("open",open_from_file)
+       .staticmethod("open")
        ;    
+    
 }