Merge master.

diff --git a/ChangeLog b/ChangeLog
index c2439f80742ebb65e023a5420aa96f5215b04518..2782b563e9eaf5a9178f257c7871fb8a46265932 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
        * Add subtitle view.
 
+2014-06-22  Carl Hetherington  <cth@carlh.net>
+
+       * Fix large memory leak with image sources.
+
 2014-06-21  Carl Hetherington  <cth@carlh.net>
 
        * Move email config into the KDM email page.

diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc
index 1eb9c169c5c3b375d4677b61f6b19bdc58af71db..039b1113300937fde92b65a7cad3f69880f3cb6f 100644 (file)
--- a/src/lib/image_proxy.cc
+++ b/src/lib/image_proxy.cc
@@ -141,6 +141,8 @@ MagickImageProxy::image () const
                p += _image->stride()[0];
        }
 
+       delete magick_image;
+
        LOG_TIMING ("[%1] MagickImageProxy completes decode and convert of %2 bytes", boost::this_thread::get_id(), _blob.length());
 
        return _image;