From: Carl Hetherington <cth@carlh.net>
Date: Sun, 22 Jun 2014 20:48:49 +0000 (+0100)
Subject: Merge master.
X-Git-Tag: v2.0.48~778
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=e6c67f4aac2ca9afc275b6f13058e1e46f2cecc3;hp=f0edd6ab35c3c2b7800a26ec8206adab75e5f633

Merge master.
---

diff --git a/ChangeLog b/ChangeLog
index c2439f807..2782b563e 100644
--- 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 1eb9c169c..039b11133 100644
--- 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;