OpenSim-NGC · mdickson · Dec 18, 2025 · Dec 17, 2025
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
@@ -169,13 +169,13 @@ private bool FetchTexture(Hashtable request, Hashtable response, UUID textureID,
                         return true;
                     }
                 }
-           }
-           else // it was on the cache
-           {
-               //m_log.DebugFormat("[GETTEXTURE]: texture was in the cache");
-               WriteTextureData(request, response, texture, format);
-               return true;
-           }
+            }
+            else // it was on the cache
+            {
+                //m_log.DebugFormat("[GETTEXTURE]: texture was in the cache");
+                WriteTextureData(request, response, texture, format);
+                return true;
+            }
 
             //response = new Hashtable();
 
@@ -300,8 +300,7 @@ private byte[] ConvertTextureData(AssetBase texture, string format)
                 {
                     // Try CoreJ2K first
                     var j2k = J2kImage.FromBytes(texture.Data);
-                    if (j2k != null)
-                        skImage = j2k.As<SKImage>();
+                    skImage = j2k?.As<SKImage>();
                 }
                 catch
                 {

diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs
@@ -314,20 +314,19 @@ private byte[] ConvertTextureData(AssetBase texture, string format)
         {
             m_log.DebugFormat("[GETTEXTURE]: Converting texture {0} to {1}", texture.ID, format);
             byte[] data = Array.Empty<byte>();
-            // Try CSJ2K (CoreJ2K) first to get an SKImage
+            // Try CoreJ2K first to get an SKImage
             try
             {
                 SKImage skImage = null;
 
                 try
                 {
                     var j2k = J2kImage.FromBytes(texture.Data);
-                    if (j2k != null)
-                        skImage = j2k.As<SKImage>();
+                    skImage = j2k?.As<SKImage>();
                 }
                 catch (Exception)
                 {
-                    // CSJ2K not available or failed, fall back to OpenJPEG
+                    // CoreJ2K not available or failed, fall back to OpenJPEG
                     skImage = null;
                 }
 

diff --git a/OpenSim/Capabilities/Handlers/OpenSim.Capabilities.Handlers.csproj b/OpenSim/Capabilities/Handlers/OpenSim.Capabilities.Handlers.csproj
@@ -27,6 +27,6 @@
     <PackageReference Include="log4net" Version="3.2.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.10" />
     <PackageReference Include="SkiaSharp" Version="3.119.1" />
-    <PackageReference Include="CoreJ2K.Skia" Version="1.2.2.68" />
+    <PackageReference Include="CoreJ2K.Skia" Version="2.1.0.101" />
   </ItemGroup>
 </Project>
diff --git a/OpenSim/Framework/OpenSim.Framework.csproj b/OpenSim/Framework/OpenSim.Framework.csproj
@@ -161,7 +161,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="SkiaSharp" Version="3.119.1" />
-    <PackageReference Include="CoreJ2K.Skia" Version="1.2.2.68" />
+    <PackageReference Include="CoreJ2K.Skia" Version="2.1.0.101" />
     <PackageReference Include="log4net" Version="3.2.0" />
     <PackageReference Include="Mono.Addins" Version="1.4.1" />
     <PackageReference Include="Mono.Addins.Setup" Version="1.4.1" />

diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
@@ -225,7 +225,7 @@ private bool DoJ2KDecode(UUID assetID, byte[] j2kData, out J2KLayerInfo[] layers
 //                "[J2KDecoderModule]: Doing J2K decoding of {0} bytes for asset {1}", j2kData.Length, assetID);
 
             bool decodedSuccessfully = true;
-            components = 0; // Not used by CoreJ2K decode path
+            components = 0;
 
             if (!TryLoadCacheForAsset(assetID, out layers))
             {
@@ -237,7 +237,7 @@ private bool DoJ2KDecode(UUID assetID, byte[] j2kData, out J2KLayerInfo[] layers
                     {
                         // Extract layer information from CoreJ2K - create default layers for now
                         layers = CreateDefaultLayers(j2kData.Length);
-                        components = 3; // Typical JPEG2000 has 3 components (RGB)
+                        components = j2k.NumberOfComponents;
                         decodedSuccessfully = true;
                         // Cache decoded layers
                         SaveFileCacheForAsset(assetID, layers);

diff --git a/OpenSim/Region/CoreModules/OpenSim.Region.CoreModules.csproj b/OpenSim/Region/CoreModules/OpenSim.Region.CoreModules.csproj
@@ -74,7 +74,7 @@
     <PackageReference Include="Mono.Addins.CecilReflector" Version="1.4.1" />
     <PackageReference Include="MySqlConnector" Version="2.4.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.10" />
-    <PackageReference Include="CoreJ2K.Skia" Version="1.2.2.68" />
+    <PackageReference Include="CoreJ2K.Skia" Version="2.1.0.101" />
     <PackageReference Include="SkiaSharp" Version="3.119.1" />
   </ItemGroup>
 </Project>
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -27,14 +27,14 @@
 
 using SkiaSharp;
 using System.Globalization;
-using System.Net;
 using Nini.Config;
 using OpenMetaverse;
-using OpenMetaverse.Imaging;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using log4net;
 using System.Reflection;
+using CoreJ2K;
+using CoreJ2K.Configuration;
 using Mono.Addins;
 
 //using Cairo;
@@ -53,6 +53,11 @@ public class VectorRenderModule : ISharedRegionModule, IDynamicTextureRender
         private static object thisLock = new object();
         private static SKTypeface m_typeface = null; // SkiaSharp typeface for measurements
 
+        private readonly J2KEncoderConfiguration encoderConfig = new J2KEncoderConfiguration()
+            .WithTiles(t => t.SetSize(256, 256))
+            .WithWavelet(w => w.UseIrreversible97().WithDecompositionLevels(4))
+            .WithProgression(p => p.WithOrder(ProgressionOrder.LRCP).WithQualityLayers(0.1f, 0.5f, 1.0f));
+
         private Scene m_scene;
         private IDynamicTextureManager m_textureManager;
 
@@ -226,8 +231,8 @@ public Type ReplaceableInterface
 
         private IDynamicTexture Draw(string data, string extraParams)
         {
-            // We need to cater for old scripts that didnt use extraParams neatly, they use either an integer size which represents both width and height, or setalpha
-            // we will now support multiple comma seperated params in the form  width:256,height:512,alpha:255
+            // We need to cater for old scripts that didn't use extraParams neatly, they use either an integer size which represents both width and height, or setalpha
+            // we will now support multiple comma separated params in the form  width:256,height:512,alpha:255
             int width = 256;
             int height = 256;
             int alpha = 255; // 0 is transparent
@@ -361,7 +366,7 @@ private IDynamicTexture Draw(string data, string extraParams)
                                  height = temp;
                              }
                          }
-                     break;
+                         break;
                 }
             }
 
@@ -403,13 +408,7 @@ private IDynamicTexture Draw(string data, string extraParams)
 
                 try
                 {
-                    // Convert SKBitmap to SKImage and encode as JPEG
-                    // TODO: Replace with CoreJ2K encoding when encoder becomes available
-                    using (var image = SKImage.FromBitmap(bitmap))
-                    {
-                        var data_encoded = image.Encode(SKEncodedImageFormat.Jpeg, 100);
-                        imageJ2000 = data_encoded.ToArray();
-                    }
+                    imageJ2000 = J2kImage.ToBytes(bitmap, encoderConfig);
                 }
                 catch (Exception e)
                 {
@@ -425,11 +424,8 @@ private IDynamicTexture Draw(string data, string extraParams)
             {
                 lock (thisLock)
                 {
-                    if (canvas != null)
-                        canvas.Dispose();
-
-                    if (bitmap != null)
-                        bitmap.Dispose();
+                    canvas?.Dispose();
+                    bitmap?.Dispose();
                 }
             }
         }

diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
@@ -25,15 +25,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
 using System.Reflection;
-using System.IO;
 using log4net;
 using Mono.Addins;
 using Nini.Config;
+using CoreJ2K;
+using CoreJ2K.Configuration;
 using OpenMetaverse;
-using OpenMetaverse.Imaging;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
@@ -73,6 +71,12 @@ public class MapImageModule : IMapImageGenerator, INonSharedRegionModule
         private IMapTileTerrainRenderer terrainRenderer;
         private bool m_Enabled = false;
 
+        private readonly J2KEncoderConfiguration encoderConfig = new J2KEncoderConfiguration()
+            .WithQuality(0.85)
+            .WithTiles(t => t.SetSize(256, 256))
+            .WithWavelet(w => w.UseIrreversible97().WithDecompositionLevels(7))
+            .WithProgression(p => p.WithOrder(ProgressionOrder.RPCL));
+
         #region IMapImageGenerator Members
 
         public SKBitmap CreateMapTile()
@@ -94,9 +98,8 @@ public SKBitmap CreateMapTile()
                     float minHeight = float.MaxValue;
 
                     // Find height range
-                    for (int i = 0; i < heightData.Length; i++)
+                    foreach (var height in heightData)
                     {
-                        float height = heightData[i];
                         maxHeight = Math.Max(maxHeight, height);
                         minHeight = Math.Min(minHeight, height);
                     }
@@ -147,13 +150,7 @@ public byte[] WriteJpeg2000Image()
                 {
                     if (skBitmap != null)
                     {
-                        // Convert SKBitmap to SKImage and encode as JPEG
-                        // TODO: Replace with CoreJ2K encoding when encoder becomes available
-                        using (var image = SKImage.FromBitmap(skBitmap))
-                        {
-                            var encoded = image.Encode(SKEncodedImageFormat.Jpeg, 100);
-                            return encoded.ToArray();
-                        }
+                        return J2kImage.ToBytes(skBitmap, encoderConfig);
                     }
                 }
             }

diff --git a/OpenSim/Region/Framework/OpenSim.Region.Framework.csproj b/OpenSim/Region/Framework/OpenSim.Region.Framework.csproj
@@ -59,7 +59,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="SkiaSharp" Version="3.119.1" />
-    <PackageReference Include="CoreJ2K.Skia" Version="1.2.2.68" />
+    <PackageReference Include="CoreJ2K.Skia" Version="2.1.0.101" />
     <PackageReference Include="log4net" Version="3.2.0" />
     <PackageReference Include="Mono.Addins" Version="1.4.1" />
     <PackageReference Include="Mono.Addins.CecilReflector" Version="1.4.1" />

diff --git a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs
@@ -25,10 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
 using System.Reflection;
-using System.IO;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
@@ -37,6 +34,7 @@
 using OpenMetaverse.StructuredData;
 using SkiaSharp;
 using CoreJ2K;
+using CoreJ2K.Configuration;
 using System.IO.Compression;
 using PrimMesher;
 using log4net;
@@ -71,6 +69,9 @@ public class Meshmerizer : IMesher, INonSharedRegionModule
         // Mesh cache. Static so it can be shared across instances of this class
         private static Dictionary<ulong, Mesh> m_uniqueMeshes = new Dictionary<ulong, Mesh>();
 
+        private readonly J2KDecoderConfiguration decoderConfig = new J2KDecoderConfiguration()
+            .WithHighestResolution();
+
         #region INonSharedRegionModule
         public string Name
         {
@@ -661,9 +662,8 @@ private bool GenerateCoordsAndFacesFromPrimSculptData(
                     SKImage skImage = null;
                     try
                     {
-                        var j2k = J2kImage.FromBytes(primShape.SculptData);
-                        if (j2k != null)
-                            skImage = j2k.As<SKImage>();
+                        var j2k = J2kImage.FromBytes(primShape.SculptData, decoderConfig);
+                        skImage = j2k?.As<SKImage>();
                     }
                     catch
                     {

diff --git a/OpenSim/Region/PhysicsModules/Meshing/OpenSim.Region.PhysicsModule.Meshing.csproj b/OpenSim/Region/PhysicsModules/Meshing/OpenSim.Region.PhysicsModule.Meshing.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Mono.Addins" Version="1.4.1" />
     <PackageReference Include="Mono.Addins.CecilReflector" Version="1.4.1" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.10" />
-    <PackageReference Include="CoreJ2K.Skia" Version="1.2.2.68" />
+    <PackageReference Include="CoreJ2K.Skia" Version="2.1.0.101" />
     <PackageReference Include="SkiaSharp" Version="3.119.1" />
   </ItemGroup>
   <ItemGroup>

diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
@@ -26,25 +26,23 @@
  */
 //#define SPAM
 
+using CoreJ2K;
+using CoreJ2K.Configuration;
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
 using OpenSim.Framework;
-using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.PhysicsModules.SharedBase;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet;
-
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-
+using OpenSim.Region.PhysicsModules.SharedBase;
+using PrimMesher;
 using SkiaSharp;
-using CoreJ2K;
 using System.IO.Compression;
-using PrimMesher;
-using log4net;
-using Nini.Config;
 using System.Reflection;
 
-using Mono.Addins;
-
 namespace OpenSim.Region.PhysicsModule.ubODEMeshing
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ubODEMeshmerizer")]
@@ -56,7 +54,7 @@ public class ubMeshmerizer : IMesher, INonSharedRegionModule
         // raw files can be imported by blender so a visual inspection of the results can be done
 
         const float floatPI = MathF.PI;
-        private readonly static string cacheControlFilename = "cntr";
+        private static readonly string cacheControlFilename = "cntr";
         private bool m_Enabled = false;
 
         public static object diskLock = new();
@@ -76,6 +74,9 @@ public class ubMeshmerizer : IMesher, INonSharedRegionModule
         private readonly Dictionary<AMeshKey, Mesh> m_uniqueMeshes = new();
         private readonly Dictionary<AMeshKey, Mesh> m_uniqueReleasedMeshes = new();
 
+        private readonly J2KDecoderConfiguration decoderConfig = new J2KDecoderConfiguration()
+            .WithHighestResolution();
+
         #region INonSharedRegionModule
         public string Name
         {
@@ -715,7 +716,7 @@ private static bool GenerateCoordsAndFacesFromPrimSculptData(
                 SKBitmap skBitmap = null;
                 try
                 {
-                    var j2k = J2kImage.FromBytes(primShape.SculptData);
+                    var j2k = J2kImage.FromBytes(primShape.SculptData, decoderConfig);
                     if (j2k != null)
                         skBitmap = j2k.As<SKBitmap>();
                 }

diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/OpenSim.Region.PhysicsModule.ubOdeMeshing.csproj b/OpenSim/Region/PhysicsModules/ubOdeMeshing/OpenSim.Region.PhysicsModule.ubOdeMeshing.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="Mono.Addins" Version="1.4.1" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.10" />
     <PackageReference Include="Mono.Addins.CecilReflector" Version="1.4.1" />
-    <PackageReference Include="CoreJ2K.Skia" Version="1.2.2.68" />
+    <PackageReference Include="CoreJ2K.Skia" Version="2.1.0.101" />
     <PackageReference Include="SkiaSharp" Version="3.119.1" />
   </ItemGroup>
   <ItemGroup>

diff --git a/OpenSim/Services/Connectors/OpenSim.Services.Connectors.csproj b/OpenSim/Services/Connectors/OpenSim.Services.Connectors.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="SkiaSharp" Version="3.119.1" />
-    <PackageReference Include="CoreJ2K.Skia" Version="1.2.2.68" />
+    <PackageReference Include="CoreJ2K.Skia" Version="2.1.0.101" />
     <PackageReference Include="log4net" Version="3.2.0" />
     <PackageReference Include="Mono.Addins" Version="1.4.1" />
     <PackageReference Include="Mono.Addins.CecilReflector" Version="1.4.1" />

diff --git a/OpenSim/Services/MapImageService/OpenSim.Services.MapImageService.csproj b/OpenSim/Services/MapImageService/OpenSim.Services.MapImageService.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="SkiaSharp" Version="3.119.1" />
-    <PackageReference Include="CoreJ2K.Skia" Version="1.2.2.68" />
+    <PackageReference Include="CoreJ2K.Skia" Version="2.1.0.101" />
     <ProjectReference Include="..\..\Framework\OpenSim.Framework.csproj" />
     <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj" />
     <ProjectReference Include="..\..\Framework\Servers\HttpServer\OpenSim.Framework.Servers.HttpServer.csproj" />