From 7838689dda4593b57f4afae2a1cf92b60b31e9fb Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 4 May 2018 16:59:11 +0100 Subject: [PATCH] why where map and dynamic textures compressed lossless? --- .../Scripting/VectorRender/VectorRenderModule.cs | 4 ++-- .../Region/CoreModules/World/LegacyMap/MapImageModule.cs | 2 +- .../CoreModules/World/Warp3DMap/Warp3DImageModule.cs | 2 +- .../Region/CoreModules/World/WorldMap/WorldMapModule.cs | 8 ++++---- .../Connectors/Hypergrid/GatekeeperServiceConnector.cs | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs index a012093796..475e8e970c 100644 --- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs @@ -389,7 +389,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender try { - imageJ2000 = OpenJPEG.EncodeFromImage(bitmap, true); + imageJ2000 = OpenJPEG.EncodeFromImage(bitmap, false); } catch (Exception e) { @@ -685,7 +685,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender case "S": myFontStyle |= FontStyle.Strikeout; break; - case "R": //This special case resets all font properties + case "R": //This special case resets all font properties myFontStyle = FontStyle.Regular; break; } diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs index b927cfa7ea..ce82c2658c 100644 --- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs +++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs @@ -153,7 +153,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap using (Bitmap mapbmp = CreateMapTile()) { if (mapbmp != null) - return OpenJPEG.EncodeFromImage(mapbmp, true); + return OpenJPEG.EncodeFromImage(mapbmp, false); } } catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs index 4934ebddb2..6d68c61453 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs @@ -251,7 +251,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap try { using (Bitmap mapbmp = CreateMapTile()) - return OpenJPEG.EncodeFromImage(mapbmp, true); + return OpenJPEG.EncodeFromImage(mapbmp, false); } catch (Exception e) { diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 64eda2f9d3..12ac436e2f 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs @@ -1673,13 +1673,13 @@ namespace OpenSim.Region.CoreModules.World.WorldMap newsize.Height = (int)(by * scale); using(Bitmap scaledbmp = new Bitmap(mapbmp,newsize)) - data = OpenJPEG.EncodeFromImage(scaledbmp, true); + data = OpenJPEG.EncodeFromImage(scaledbmp, false); } else - data = OpenJPEG.EncodeFromImage(mapbmp, true); + data = OpenJPEG.EncodeFromImage(mapbmp, false); } else - data = OpenJPEG.EncodeFromImage(mapbmp, true); + data = OpenJPEG.EncodeFromImage(mapbmp, false); if (data != null && data.Length > 0) { @@ -1857,7 +1857,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap try { - return OpenJPEG.EncodeFromImage(overlay, true); + return OpenJPEG.EncodeFromImage(overlay, false); } catch (Exception e) { diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs index e814c4579e..cb15fc0eff 100644 --- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs @@ -189,7 +189,7 @@ namespace OpenSim.Services.Connectors.Hypergrid using (Bitmap bitmap = new Bitmap(filename)) { //m_log.Debug("Size: " + m.PhysicalDimension.Height + "-" + m.PhysicalDimension.Width); - imageData = OpenJPEG.EncodeFromImage(bitmap, true); + imageData = OpenJPEG.EncodeFromImage(bitmap, false); } AssetBase ass = new AssetBase(UUID.Random(), "region " + name, (sbyte)AssetType.Texture, regionID.ToString());