From 7838689dda4593b57f4afae2a1cf92b60b31e9fb Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Fri, 4 May 2018 16:59:11 +0100
Subject: why where map and dynamic textures compressed lossless?

---
 .../CoreModules/Scripting/VectorRender/VectorRenderModule.cs      | 4 ++--
 OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs      | 2 +-
 OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs   | 2 +-
 OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs       | 8 ++++----
 .../Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs   | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index a012093..475e8e9 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 b927cfa..ce82c26 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 4934ebd..6d68c61 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 64eda2f..12ac436 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 e814c45..cb15fc0 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());
-- 
cgit v1.1