[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54934] trunk/blender/source/blender/ blenkernel/intern/movieclip.c: Fix memory leak when loading multilayer EXR as movie clip

[Sergey Sharybin]

Revision: 54934
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54934
Author:   nazgul
Date:     2013-02-28 14:25:00 +0000 (Thu, 28 Feb 2013)
Log Message:
-----------
Fix memory leak when loading multilayer EXR as movie clip

Such kind of image sequences wouldn't be displayed still
and supporting them would take some additional time, but
for now it'll be no memory leak on attempt opening such
images.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/movieclip.c

Modified: trunk/blender/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/movieclip.c	2013-02-28 14:24:52 UTC (rev 54933)
+++ trunk/blender/source/blender/blenkernel/intern/movieclip.c	2013-02-28 14:25:00 UTC (rev 54934)
@@ -81,6 +81,10 @@
 #include "IMB_imbuf.h"
 #include "IMB_moviecache.h"
 
+#ifdef WITH_OPENEXR
+#include "intern/openexr/openexr_multi.h"
+#endif
+
 /*********************** movieclip buffer loaders *************************/
 
 static int sequence_guess_offset(const char *full_name, int head_len, unsigned short numlen)
@@ -221,6 +225,13 @@
 	/* read ibuf */
 	ibuf = IMB_loadiffname(name, loadflag, colorspace);
 
+#ifdef WITH_OPENEXR
+	if (ibuf->ftype == OPENEXR && ibuf->userdata) {
+		IMB_exr_close(ibuf->userdata);
+		ibuf->userdata = NULL;
+	}
+#endif
+
 	return ibuf;
 }