Changeset 727

Timestamp:

07/30/08 08:47:37 (5 months ago)

Author:

tom

Message:

Make the python bindings for image views actually only return data
from the view and not the whole image.

Files:

• trunk/bindings/python/mapnik_image_view.cpp (modified) (2 diffs)

trunk/bindings/python/mapnik_image_view.cpp

@@ -41 +41 @@
 PyObject* view_tostring1(image_view<ImageData32> const& view)
 {
-    int size = view.width() * view.height() * 4;
-    return ::PyString_FromStringAndSize((const char*)view.data().getBytes(),size);
+   std::ostringstream ss(std::ios::out|std::ios::binary);
+   for (unsigned i=0;i<view.height();i++)
+   {
+      ss.write(reinterpret_cast<const char*>(view.getRow(i)), 
+               view.width() * sizeof(image_view<ImageData32>::pixel_type));
+   }
+   return ::PyString_FromStringAndSize((const char*)ss.str().c_str(),ss.str().size());
 }
 
@@ -49 +54 @@
 {
    std::ostringstream ss(std::ios::out|std::ios::binary);
-   if (format == "png") save_as_png(ss,view.data());
-   else if (format == "png256") save_as_png256(ss,view.data());
-   else if (format == "jpeg") save_as_jpeg(ss,85,view.data());
+   if (format == "png") save_as_png(ss,view);
+   else if (format == "png256") save_as_png256(ss,view);
+   else if (format == "jpeg") save_as_jpeg(ss,85,view);
    else throw mapnik::ImageWriterException("unknown format: " + format);
    return ::PyString_FromStringAndSize((const char*)ss.str().c_str(),ss.str().size());