aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs8
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs2
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 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
389 389
390 try 390 try
391 { 391 {
392 imageJ2000 = OpenJPEG.EncodeFromImage(bitmap, true); 392 imageJ2000 = OpenJPEG.EncodeFromImage(bitmap, false);
393 } 393 }
394 catch (Exception e) 394 catch (Exception e)
395 { 395 {
@@ -685,7 +685,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
685 case "S": 685 case "S":
686 myFontStyle |= FontStyle.Strikeout; 686 myFontStyle |= FontStyle.Strikeout;
687 break; 687 break;
688 case "R": //This special case resets all font properties 688 case "R": //This special case resets all font properties
689 myFontStyle = FontStyle.Regular; 689 myFontStyle = FontStyle.Regular;
690 break; 690 break;
691 } 691 }
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
153 using (Bitmap mapbmp = CreateMapTile()) 153 using (Bitmap mapbmp = CreateMapTile())
154 { 154 {
155 if (mapbmp != null) 155 if (mapbmp != null)
156 return OpenJPEG.EncodeFromImage(mapbmp, true); 156 return OpenJPEG.EncodeFromImage(mapbmp, false);
157 } 157 }
158 } 158 }
159 catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke 159 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
251 try 251 try
252 { 252 {
253 using (Bitmap mapbmp = CreateMapTile()) 253 using (Bitmap mapbmp = CreateMapTile())
254 return OpenJPEG.EncodeFromImage(mapbmp, true); 254 return OpenJPEG.EncodeFromImage(mapbmp, false);
255 } 255 }
256 catch (Exception e) 256 catch (Exception e)
257 { 257 {
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
1673 newsize.Height = (int)(by * scale); 1673 newsize.Height = (int)(by * scale);
1674 1674
1675 using(Bitmap scaledbmp = new Bitmap(mapbmp,newsize)) 1675 using(Bitmap scaledbmp = new Bitmap(mapbmp,newsize))
1676 data = OpenJPEG.EncodeFromImage(scaledbmp, true); 1676 data = OpenJPEG.EncodeFromImage(scaledbmp, false);
1677 } 1677 }
1678 else 1678 else
1679 data = OpenJPEG.EncodeFromImage(mapbmp, true); 1679 data = OpenJPEG.EncodeFromImage(mapbmp, false);
1680 } 1680 }
1681 else 1681 else
1682 data = OpenJPEG.EncodeFromImage(mapbmp, true); 1682 data = OpenJPEG.EncodeFromImage(mapbmp, false);
1683 1683
1684 if (data != null && data.Length > 0) 1684 if (data != null && data.Length > 0)
1685 { 1685 {
@@ -1857,7 +1857,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
1857 1857
1858 try 1858 try
1859 { 1859 {
1860 return OpenJPEG.EncodeFromImage(overlay, true); 1860 return OpenJPEG.EncodeFromImage(overlay, false);
1861 } 1861 }
1862 catch (Exception e) 1862 catch (Exception e)
1863 { 1863 {
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
189 using (Bitmap bitmap = new Bitmap(filename)) 189 using (Bitmap bitmap = new Bitmap(filename))
190 { 190 {
191 //m_log.Debug("Size: " + m.PhysicalDimension.Height + "-" + m.PhysicalDimension.Width); 191 //m_log.Debug("Size: " + m.PhysicalDimension.Height + "-" + m.PhysicalDimension.Width);
192 imageData = OpenJPEG.EncodeFromImage(bitmap, true); 192 imageData = OpenJPEG.EncodeFromImage(bitmap, false);
193 } 193 }
194 194
195 AssetBase ass = new AssetBase(UUID.Random(), "region " + name, (sbyte)AssetType.Texture, regionID.ToString()); 195 AssetBase ass = new AssetBase(UUID.Random(), "region " + name, (sbyte)AssetType.Texture, regionID.ToString());