Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-12-24 20:04:13 +08:00
Code Issues Projects Releases Wiki Activity

(ParallelCbgDecoder): implement IDisposable interface.

Browse Source
This commit is contained in:
morkt 2016-01-16 17:14:24 +04:00
parent 749aca45cd
commit e2cb4424c7
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ArcFormats/Ethornell/ImageBGI.cs
View File

@ -190,7 +190,12 @@ namespace GameRes.Formats.BGI
if (m_info.Version < 2) if (m_info.Version < 2)
UnpackV1(); UnpackV1();
else if (2 == m_info.Version) else if (2 == m_info.Version)
UnpackV2(); {
if (m_info.EncLength < 0x80)
throw new InvalidFormatException();
using (var decoder = new ParallelCbgDecoder (m_info, ReadEncoded()))
UnpackV2 (decoder);
}
else else
throw new NotSupportedException ("Not supported CompressedBG version"); throw new NotSupportedException ("Not supported CompressedBG version");
} }
@ -330,11 +335,8 @@ namespace GameRes.Formats.BGI
} }
} }
void UnpackV2 () void UnpackV2 (ParallelCbgDecoder decoder)
{ {
if (m_info.EncLength < 0x80)
throw new InvalidFormatException();
var decoder = new ParallelCbgDecoder (m_info, ReadEncoded());
var base_offset = Input.Position; var base_offset = Input.Position;
decoder.Tree1 = new HuffmanTree (ReadWeightTable (Input, 0x10), true); decoder.Tree1 = new HuffmanTree (ReadWeightTable (Input, 0x10), true);
decoder.Tree2 = new HuffmanTree (ReadWeightTable (Input, 0xB0), true); decoder.Tree2 = new HuffmanTree (ReadWeightTable (Input, 0xB0), true);
@ -470,7 +472,7 @@ namespace GameRes.Formats.BGI
} }
} }
internal class ParallelCbgDecoder internal sealed class ParallelCbgDecoder : IDisposable
{ {
public byte[] Input; public byte[] Input;
public byte[] Output; public byte[] Output;
@ -802,5 +804,18 @@ namespace GameRes.Formats.BGI
return 0; return 0;
return (byte)f; return (byte)f;
} }
#region IDisposable Members
bool _disposed = false;
public void Dispose ()
{
if (!_disposed)
{
s_YCbCr_block.Dispose();
s_tmp.Dispose();
_disposed = true;
}
}
#endregion
} }
} }