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

Revert "Experimental and likely broken OpenJpeg replacement"

Browse Source 
This reverts commit 4a1b646e3e.
This commit is contained in:
Cinder
2021-06-30 07:59:26 -05:00
parent 4c6c19b4a0
commit 48455d63b0
36 changed files with 703 additions and 2146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Programs/examples/TestClient/Commands/Inventory/DumpOutfitCommand.cs
View File

@@ -5,7 +5,6 @@ using System.Collections.Generic;
using OpenMetaverse;
using OpenMetaverse.Imaging;
using OpenMetaverse.Assets;
using LibreMetaverse.Imaging;
namespace OpenMetaverse.TestClient
{
@@ -92,14 +91,10 @@ namespace OpenMetaverse.TestClient
File.WriteAllBytes(assetTexture.AssetID + ".jp2", assetTexture.AssetData);
Console.WriteLine("Wrote JPEG2000 image " + assetTexture.AssetID + ".jp2");
using (J2KReader reader = new J2KReader(assetTexture.AssetData))
{
reader.ReadHeader();
System.Drawing.Bitmap bitmap = reader.DecodeToBitmap();
ManagedImage imgData = new ManagedImage(bitmap);
byte[] tgaFile = imgData.ExportTGA();
File.WriteAllBytes(assetTexture.AssetID + ".tga", tgaFile);
}
ManagedImage imgData;
OpenJPEG.DecodeToImage(assetTexture.AssetData, out imgData);
byte[] tgaFile = imgData.ExportTGA();
File.WriteAllBytes(assetTexture.AssetID + ".tga", tgaFile);
Console.WriteLine("Wrote TGA image " + assetTexture.AssetID + ".tga");
}
catch (Exception e)

27
Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs
View File

@@ -77,7 +77,7 @@ namespace OpenMetaverse.TestClient
private byte[] LoadImage(string fileName)
{
byte[] UploadData = { };
byte[] UploadData;
string lowfilename = fileName.ToLower();
Bitmap bitmap = null;
@@ -85,22 +85,22 @@ namespace OpenMetaverse.TestClient
{
if (lowfilename.EndsWith(".jp2") || lowfilename.EndsWith(".j2c"))
{
Image image;
ManagedImage managedImage;
// Upload JPEG2000 images untouched
UploadData = System.IO.File.ReadAllBytes(fileName);
using (var reader = new LibreMetaverse.Imaging.J2KReader(UploadData))
{
reader.ReadHeader();
bitmap = reader.DecodeToBitmap();
}
OpenJPEG.DecodeToImage(UploadData, out managedImage, out image);
bitmap = (Bitmap)image;
}
else
{
if (lowfilename.EndsWith(".tga")) {
if (lowfilename.EndsWith(".tga"))
bitmap = LoadTGAClass.LoadTGA(fileName);
} else {
else
bitmap = (Bitmap)Image.FromFile(fileName);
}
int oldwidth = bitmap.Width;
int oldheight = bitmap.Height;
@@ -137,11 +137,8 @@ namespace OpenMetaverse.TestClient
bitmap.Dispose();
bitmap = resized;
}
using (var writer = new LibreMetaverse.Imaging.J2KWriter(UploadData))
{
writer.WriteHeader(new OpenJpegDotNet.IO.Parameter { Compression = 1 });
UploadData = writer.Encode(bitmap);
}
UploadData = OpenJPEG.EncodeFromImage(bitmap, false);
}
}
catch (Exception ex)

1
Programs/examples/TestClient/TestClient.csproj
View File

@@ -24,7 +24,6 @@
<PostBuildEvent />
<IsPackable>false</IsPackable>
<TargetFrameworks>netcoreapp3.1;net50</TargetFrameworks>
<Platforms>AnyCPU;x64;x86</Platforms>
</PropertyGroup>
<PropertyGroup>
<PreBuildEvent />