OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

do not use lossless compression on dyntextures

0.9.1.0-post-fixes
UbitUmarov 2018-07-14 15:13:21 +01:00
parent ef8097f998
commit 84235900b2
2 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
View File

@ -588,7 +588,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
try try
{ {
result = OpenJPEG.EncodeFromImage(joint, true); result = OpenJPEG.EncodeFromImage(joint, false);
} }
catch (Exception e) catch (Exception e)
{ {

19
OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
View File

@ -215,30 +215,30 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
{ {
try try
{ {
Bitmap image = new Bitmap(stream); using(Bitmap image = new Bitmap(stream))
{
// TODO: make this a bit less hard coded // TODO: make this a bit less hard coded
if ((image.Height < 64) && (image.Width < 64)) if((image.Height < 64) && (image.Width < 64))
{ {
newSize.Width = 32; newSize.Width = 32;
newSize.Height = 32; newSize.Height = 32;
} }
else if ((image.Height < 128) && (image.Width < 128)) else if((image.Height < 128) && (image.Width < 128))
{ {
newSize.Width = 64; newSize.Width = 64;
newSize.Height = 64; newSize.Height = 64;
} }
else if ((image.Height < 256) && (image.Width < 256)) else if((image.Height < 256) && (image.Width < 256))
{ {
newSize.Width = 128; newSize.Width = 128;
newSize.Height = 128; newSize.Height = 128;
} }
else if ((image.Height < 512 && image.Width < 512)) else if((image.Height < 512 && image.Width < 512))
{ {
newSize.Width = 256; newSize.Width = 256;
newSize.Height = 256; newSize.Height = 256;
} }
else if ((image.Height < 1024 && image.Width < 1024)) else if((image.Height < 1024 && image.Width < 1024))
{ {
newSize.Width = 512; newSize.Width = 512;
newSize.Height = 512; newSize.Height = 512;
@ -249,9 +249,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
newSize.Height = 1024; newSize.Height = 1024;
} }
using (Bitmap resize = new Bitmap(image, newSize)) using(Bitmap resize = new Bitmap(image, newSize))
{ {
imageJ2000 = OpenJPEG.EncodeFromImage(resize, true); imageJ2000 = OpenJPEG.EncodeFromImage(resize, false);
}
} }
} }
catch (Exception) catch (Exception)