Roll J2K classes into our fork of OpenJpegDotNet and adjust with our improvements to the lib
NOTE native library needs fixed for not-Windows!
This commit is contained in:
@@ -1,3 +1,30 @@
|
||||
/**
|
||||
* Copyright (c) 2006-2016, openmetaverse.co
|
||||
* Copyright (c) 2021, Sjofn LLC.
|
||||
* All rights reserved.
|
||||
*
|
||||
* - Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* - Redistributions of source code must retain the above copyright notice, this
|
||||
* list of conditions and the following disclaimer.
|
||||
* - Neither the name of the openmetaverse.co nor the names
|
||||
* of its contributors may be used to endorse or promote products derived from
|
||||
* this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Threading;
|
||||
using System.Drawing;
|
||||
@@ -88,7 +115,7 @@ namespace OpenMetaverse.TestClient
|
||||
// Upload JPEG2000 images untouched
|
||||
UploadData = System.IO.File.ReadAllBytes(fileName);
|
||||
|
||||
using (var reader = new LibreMetaverse.Imaging.J2KReader(UploadData))
|
||||
using (var reader = new OpenJpegDotNet.IO.Reader(UploadData))
|
||||
{
|
||||
reader.ReadHeader();
|
||||
bitmap = reader.DecodeToBitmap();
|
||||
@@ -137,7 +164,7 @@ namespace OpenMetaverse.TestClient
|
||||
bitmap.Dispose();
|
||||
bitmap = resized;
|
||||
}
|
||||
using (var writer = new LibreMetaverse.Imaging.J2KWriter(bitmap))
|
||||
using (var writer = new OpenJpegDotNet.IO.Writer(bitmap))
|
||||
{
|
||||
UploadData = writer.Encode();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user