From 4ac2f839bdba84569877f5ab8c2e9ea0cfe87413 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 20 Apr 2012 03:32:38 +0100
Subject: Remember to dispose of the bitmap opened from a file in
 GatekeeperServiceConnector.GetMapImage()

---
 .../Connectors/Hypergrid/GatekeeperServiceConnector.cs    | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
index 0430ef6..19dffc3 100644
--- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
@@ -154,7 +154,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
 
             UUID mapTile = m_HGMapImage;
             string filename = string.Empty;
-            Bitmap bitmap = null;
+
             try
             {
                 WebClient c = new WebClient();
@@ -167,11 +167,18 @@ namespace OpenSim.Services.Connectors.Hypergrid
                     c.DownloadFile(imageURL, filename);
                 }
                 else
+                {
                     m_log.DebugFormat("[GATEKEEPER SERVICE CONNECTOR]: using cached image");
+                }
+
+                byte[] imageData = null;
 
-                bitmap = new Bitmap(filename);
-                //m_log.Debug("Size: " + m.PhysicalDimension.Height + "-" + m.PhysicalDimension.Width);
-                byte[] imageData = OpenJPEG.EncodeFromImage(bitmap, true);
+                using (Bitmap bitmap = new Bitmap(filename))
+                {
+                    //m_log.Debug("Size: " + m.PhysicalDimension.Height + "-" + m.PhysicalDimension.Width);
+                    imageData = OpenJPEG.EncodeFromImage(bitmap, true);
+                }
+                
                 AssetBase ass = new AssetBase(UUID.Random(), "region " + name, (sbyte)AssetType.Texture, regionID.ToString());
 
                 // !!! for now
-- 
cgit v1.1