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

CSJ2K improvements (LIBOMV-861):

Browse Source 
* J2kImage.FromStream() can now handle five component textures (the fifth component is ignored since System.Drawing.Image only supports up to four components
* Fixed incorrect RGBA ordering for four and five component textures

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3410 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
John Hurliman
2010-08-05 00:32:36 +00:00
parent 90c80753ac
commit 77e55fa488
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
CSJ2K/J2kImage.cs
View File

@@ -194,8 +194,7 @@ namespace CSJ2K
decodedImage = ictransf;
}
int numComps = decodedImage.NumComps;
int bytesPerPixel = (numComps == 4 ? 4 : 3);
int bytesPerPixel = numComps; // Assuming 8-bit components
// **** Copy to Bitmap ****
PixelFormat pixelFormat;
@@ -206,6 +205,7 @@ namespace CSJ2K
case 3:
pixelFormat = PixelFormat.Format24bppRgb; break;
case 4:
case 5:
pixelFormat = PixelFormat.Format32bppArgb; break;
default:
throw new ApplicationException("Unsupported PixelFormat. " + numComps + " components.");
@@ -259,7 +259,8 @@ namespace CSJ2K
int[] k = new int[numComps];
for (int i = numComps - 1; i >= 0; i--) k[i] = db[i].offset + width - 1;
byte[] rowvalues = new byte[width * bytesPerPixel];
int outputBytesPerPixel = Math.Min(bytesPerPixel, 4);
byte[] rowvalues = new byte[width * outputBytesPerPixel];
for (int i = width - 1; i >= 0; i--)
{
@@ -273,7 +274,7 @@ namespace CSJ2K
tmp[j] = (int)Math.Round(((double)tmp[j] / Math.Pow(2D, (double)decodedImage.getNomRangeBits(j))) * 255D);
}
int offset = i * bytesPerPixel;
int offset = i * outputBytesPerPixel;
switch (numComps)
{
case 1:
@@ -287,17 +288,18 @@ namespace CSJ2K
rowvalues[offset + 2] = (byte)tmp[0];
break;
case 4:
rowvalues[offset + 0] = (byte)tmp[3];
rowvalues[offset + 1] = (byte)tmp[2];
rowvalues[offset + 2] = (byte)tmp[1];
rowvalues[offset + 3] = (byte)tmp[0];
case 5:
rowvalues[offset + 0] = (byte)tmp[2];
rowvalues[offset + 1] = (byte)tmp[1];
rowvalues[offset + 2] = (byte)tmp[0];
rowvalues[offset + 3] = (byte)tmp[3];
break;
}
}
BitmapData dstdata = dst.LockBits(
new System.Drawing.Rectangle(tOffx, tOffy + l, width, 1),
ImageLockMode.ReadWrite, pixelFormat);
ImageLockMode.WriteOnly, pixelFormat);
IntPtr ptr = dstdata.Scan0;
System.Runtime.InteropServices.Marshal.Copy(rowvalues, 0, ptr, rowvalues.Length);