From abf94627f6752c81eec6ebe0412bdcb725a66037 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 6 Jun 2012 02:45:36 +0100
Subject: Ensure closure of bitmap and memory stream with using() statements in
 WorldViewModule.

If this has any effect then it will only be to the map images returned via requests to the /worldview simulator HTTP path (not enabled by default)
---
 .../OptionalModules/World/WorldView/WorldViewModule.cs    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs')

diff --git a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs
index 48c242d..1aee39a 100644
--- a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs
+++ b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs
@@ -113,14 +113,15 @@ namespace OpenSim.Region.OptionalModules.World.WorldView
             if (!m_Enabled)
                 return new Byte[0];
 
-            Bitmap bmp = m_Generator.CreateViewImage(pos, rot, fov, width,
-                    height, usetex);
-
-            MemoryStream str = new MemoryStream();
-
-            bmp.Save(str, ImageFormat.Jpeg);
+            using (Bitmap bmp = m_Generator.CreateViewImage(pos, rot, fov, width, height, usetex))
+            {
+                using (MemoryStream str = new MemoryStream())
+                {
+                    bmp.Save(str, ImageFormat.Jpeg);
 
-            return str.ToArray();
+                    return str.ToArray();
+                }
+            }
         }
     }
 }
-- 
cgit v1.1