Add some missing Dispose calls, fix some Dispose implementations.

This commit is contained in:
RoosterDragon
2015-12-29 20:11:09 +00:00
parent 85ffd505c1
commit b5f24c3fa6
11 changed files with 52 additions and 18 deletions

View File

@@ -17,7 +17,7 @@ using ICSharpCode.SharpZipLib.Zip.Compression;
namespace OpenRA.FileSystem
{
public class InstallShieldCABExtractor : IFolder
public sealed class InstallShieldCABExtractor : IFolder
{
const uint FileSplit = 0x1;
const uint FileObfuscated = 0x2;

View File

@@ -66,7 +66,7 @@ namespace OpenRA.Chat
}
}
public class GlobalChat : IDisposable
public sealed class GlobalChat : IDisposable
{
readonly IrcClient client = new IrcClient();
volatile Channel channel;

View File

@@ -17,7 +17,7 @@ using OpenRA.Primitives;
namespace OpenRA.Graphics
{
public class HardwareCursor : ICursor
public sealed class HardwareCursor : ICursor
{
readonly Dictionary<string, IHardwareCursor[]> hardwareCursors = new Dictionary<string, IHardwareCursor[]>();
readonly CursorProvider cursorProvider;

View File

@@ -24,7 +24,7 @@ namespace OpenRA.Graphics
void Tick();
}
public class SoftwareCursor : ICursor
public sealed class SoftwareCursor : ICursor
{
readonly HardwarePalette palette = new HardwarePalette();
readonly Cache<string, PaletteReference> paletteReferences;

View File

@@ -17,7 +17,7 @@ using SharpFont;
namespace OpenRA.Graphics
{
public class SpriteFont
public sealed class SpriteFont : IDisposable
{
static readonly Library Library = new Library();
@@ -150,6 +150,11 @@ namespace OpenRA.Graphics
return g;
}
public void Dispose()
{
face.Dispose();
}
}
class GlyphInfo

View File

@@ -91,6 +91,9 @@ namespace OpenRA
public void InitializeFonts(Manifest m)
{
if (Fonts != null)
foreach (var font in Fonts.Values)
font.Dispose();
using (new Support.PerfTimer("SpriteFonts"))
{
if (fontSheetBuilder != null)
@@ -175,7 +178,7 @@ namespace OpenRA
public Size Resolution { get { return Device.WindowSize; } }
public interface IBatchRenderer { void Flush(); }
public interface IBatchRenderer { void Flush(); }
public IBatchRenderer CurrentBatchRenderer
{
@@ -254,6 +257,9 @@ namespace OpenRA
tempBuffer.Dispose();
if (fontSheetBuilder != null)
fontSheetBuilder.Dispose();
if (Fonts != null)
foreach (var font in Fonts.Values)
font.Dispose();
}
public string GetClipboardText()