Fix corrupted still image sources in some cases.

diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc
index dbfd8c6d4ed48038eeac2b83e6a8fffe558d3da4..618cdbcf3ccb5183bf957c0ee504c045b30911c1 100644 (file)
--- a/src/lib/image_proxy.cc
+++ b/src/lib/image_proxy.cc
@@ -133,11 +133,13 @@ MagickImageProxy::image () const
 
        _image.reset (new Image (PIX_FMT_RGB24, size, true));
 
-       using namespace MagickCore;
-
-       magick_image->write (0, 0, size.width, size.height, "RGB", CharPixel, _image->data()[0]);
-
-       delete magick_image;
+       /* Write line-by-line here as _image must be aligned, and write() cannot be told about strides */
+       uint8_t* p = _image->data()[0];
+       for (int i = 0; i < size.height; ++i) {
+               using namespace MagickCore;
+               magick_image->write (0, i, size.width, 1, "RGB", CharPixel, p);
+               p += _image->stride()[0];
+       }
 
        LOG_TIMING ("[%1] MagickImageProxy completes decode and convert of %2 bytes", boost::this_thread::get_id(), _blob.length());
 

diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h
index b499b329283362788c778b40ccb33769f3e36ea8..f6212e54f59bc11a5c679b4551bfc8d8d57cd72f 100644 (file)
--- a/src/lib/image_proxy.h
+++ b/src/lib/image_proxy.h
@@ -49,7 +49,8 @@ class ImageProxy : public boost::noncopyable
 {
 public:
        ImageProxy (boost::shared_ptr<Log> log);
-       
+
+       /** @return Image (which must be aligned) */
        virtual boost::shared_ptr<Image> image () const = 0;
        virtual void add_metadata (xmlpp::Node *) const = 0;
        virtual void send_binary (boost::shared_ptr<Socket>) const = 0;