* Reverting the CSJ2K Array.Copy -> Buffer.BlockCopy optimization for now since I didn't properly update the length parameter the first time around (LIBOMV-861)

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3415 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
John Hurliman
2010-08-06 03:11:08 +00:00
parent 65deb8f71e
commit 3fb3d19b52
25 changed files with 106 additions and 117 deletions

View File

@@ -246,14 +246,14 @@ namespace CSJ2K.j2k.image.forwcomptransf
switch (ttype)
{
case NONE:
Buffer.BlockCopy(ntdepth, 0, tdepth, 0, ntdepth.Length);
case NONE:
Array.Copy(ntdepth, 0, tdepth, 0, ntdepth.Length);
break;
case FORW_RCT:
if (ntdepth.Length > 3)
{
Buffer.BlockCopy(ntdepth, 3, tdepth, 3, ntdepth.Length - 3);
Array.Copy(ntdepth, 3, tdepth, 3, ntdepth.Length - 3);
}
// The formulas are:
// tdepth[0] = ceil(log2(2^(ntdepth[0])+2^ntdepth[1]+
@@ -271,7 +271,7 @@ namespace CSJ2K.j2k.image.forwcomptransf
case FORW_ICT:
if (ntdepth.Length > 3)
{
Buffer.BlockCopy(ntdepth, 3, tdepth, 3, ntdepth.Length - 3);
Array.Copy(ntdepth, 3, tdepth, 3, ntdepth.Length - 3);
}
// The MathUtil.log2(x) function calculates floor(log2(x)), so we
// use 'MathUtil.log2(2*x-1)+1', which calculates ceil(log2(x))