From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001 From: onefang Date: Sun, 19 May 2019 21:24:15 +1000 Subject: Dump OpenSim 0.9.0.1 into it's own branch. --- .../Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs') diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs index 9cc767a..d604dc7 100644 --- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs @@ -59,9 +59,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders public void SaveFile(string filename, ITerrainChannel map) { - Bitmap colours = CreateBitmapFromMap(map); - - colours.Save(filename, ImageFormat.Jpeg); + using(Bitmap colours = CreateBitmapFromMap(map)) + colours.Save(filename,ImageFormat.Jpeg); } /// @@ -71,9 +70,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders /// The terrain channel being saved public void SaveStream(Stream stream, ITerrainChannel map) { - Bitmap colours = CreateBitmapFromMap(map); - - colours.Save(stream, ImageFormat.Jpeg); + using(Bitmap colours = CreateBitmapFromMap(map)) + colours.Save(stream,ImageFormat.Jpeg); } public virtual void SaveFile(ITerrainChannel m_channel, string filename, @@ -106,10 +104,10 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders using (Bitmap gradientmapLd = new Bitmap("defaultstripe.png")) { pallete = gradientmapLd.Height; - + bmp = new Bitmap(map.Width, map.Height); colours = new Color[pallete]; - + for (int i = 0; i < pallete; i++) { colours[i] = gradientmapLd.GetPixel(0, i); -- cgit v1.1