Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Minor adjustment in CSJ2K to dispose MemoryStreams when it creates them

Browse Source 
* Replaced all Packet field properties with simple class members. Big internal change but no API difference
* TextureEntry GetBytes() now disposes the MemoryStream it creates
* Added LocklessQueue.Count and LocklessQueue.Clear()

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3169 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
John Hurliman
2009-10-24 07:10:47 +00:00
parent ddcaf11908
commit 8e3d1bb711
5 changed files with 1405 additions and 4288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CSJ2K/j2k/codestream/reader/HeaderDecoder.cs
View File

@@ -2594,6 +2594,7 @@ namespace CSJ2K.j2k.codestream.reader
{
bais = new System.IO.MemoryStream((byte[])ht["SIZ"]);
readSIZ(new CSJ2K.Util.EndianBinaryReader(bais, true));
bais.Dispose();
}
// COM marker segments
@@ -2603,6 +2604,7 @@ namespace CSJ2K.j2k.codestream.reader
{
bais = new System.IO.MemoryStream((byte[])ht["COM" + i]);
readCOM(new CSJ2K.Util.EndianBinaryReader(bais, true), true, 0, i);
bais.Dispose();
}
}
@@ -2611,6 +2613,7 @@ namespace CSJ2K.j2k.codestream.reader
{
bais = new System.IO.MemoryStream((byte[])ht["CRG"]);
readCRG(new CSJ2K.Util.EndianBinaryReader(bais, true));
bais.Dispose();
}
// COD marker segment
@@ -2618,6 +2621,7 @@ namespace CSJ2K.j2k.codestream.reader
{
bais = new System.IO.MemoryStream((byte[])ht["COD"]);
readCOD(new CSJ2K.Util.EndianBinaryReader(bais, true), true, 0, 0);
bais.Dispose();
}
// COC marker segments
@@ -2627,6 +2631,7 @@ namespace CSJ2K.j2k.codestream.reader
{
bais = new System.IO.MemoryStream((byte[])ht["COC" + i]);
readCOC(new CSJ2K.Util.EndianBinaryReader(bais, true), true, 0, 0);
bais.Dispose();
}
}
@@ -2637,6 +2642,7 @@ namespace CSJ2K.j2k.codestream.reader
{
bais = new System.IO.MemoryStream((byte[])ht["RGN" + i]);
readRGN(new CSJ2K.Util.EndianBinaryReader(bais, true), true, 0, 0);
bais.Dispose();
}
}
@@ -2645,6 +2651,7 @@ namespace CSJ2K.j2k.codestream.reader
{
bais = new System.IO.MemoryStream((byte[])ht["QCD"]);
readQCD(new CSJ2K.Util.EndianBinaryReader(bais, true), true, 0, 0);
bais.Dispose();
}
// QCC marker segments
@@ -2654,6 +2661,7 @@ namespace CSJ2K.j2k.codestream.reader
{
bais = new System.IO.MemoryStream((byte[])ht["QCC" + i]);
readQCC(new CSJ2K.Util.EndianBinaryReader(bais, true), true, 0, 0);
bais.Dispose();
}
}
@@ -2662,6 +2670,7 @@ namespace CSJ2K.j2k.codestream.reader
{
bais = new System.IO.MemoryStream((byte[])ht["POC"]);
readPOC(new CSJ2K.Util.EndianBinaryReader(bais, true), true, 0, 0);
bais.Dispose();
}
// PPM marker segments
@@ -2671,6 +2680,7 @@ namespace CSJ2K.j2k.codestream.reader
{
bais = new System.IO.MemoryStream((byte[])ht["PPM" + i]);
readPPM(new CSJ2K.Util.EndianBinaryReader(bais));
bais.Dispose();
}
}