Merge pull request #239 from emcconville/issue-237

Proposed fix for issue #237 - Sequence not clearing from memory
emcconville · May 18, 2015 · a4d126e · a4d126e
2 parents 688deac + 7a392c8
commit a4d126e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/docs/changes.rst b/docs/changes.rst
@@ -32,6 +32,8 @@ Version 0.4.1
   - Render RGB :class:`Color <wand.color.Color>` preview.
   - Display each frame in image :class:`Sequence <wand.sequence.Sequence>`.
 
+- Fixed memory-leak when accessing images constructed in
+  :class:`Image.sequence[] <wand.sequence.Sequence>`. [:issue:`237` by Eric McConville]
 - Fixed Windows memory-deallocate errors on :mod:`wand.drawing` API. [:issue:`226` by Eric McConville]
 
 

diff --git a/wand/api.py b/wand/api.py
@@ -589,6 +589,9 @@ class AffineMatrix(ctypes.Structure):
     libmagick.DestroyExceptionInfo.argtypes = [ctypes.c_void_p]
     libmagick.DestroyExceptionInfo.restype = ctypes.c_void_p
 
+    libmagick.DestroyImage.argtypes = [ctypes.c_void_p]
+    libmagick.DestroyImage.restype = ctypes.c_void_p
+
     library.MagickGetSize.argtypes = [ctypes.c_void_p,
                                       ctypes.POINTER(ctypes.c_uint),
                                       ctypes.POINTER(ctypes.c_uint)]

diff --git a/wand/sequence.py b/wand/sequence.py
@@ -128,6 +128,7 @@ def __getitem__(self, index):
         single_image = libmagick.CloneImages(image, binary(str(index)), exc)
         libmagick.DestroyExceptionInfo(exc)
         single_wand = library.NewMagickWandFromImage(single_image)
+        single_image = libmagick.DestroyImage(single_image)
         library.MagickSetIteratorIndex(wand, tmp_idx)
         instance = SingleImage(single_wand, self.image, image)
         self.instances[index] = instance