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

Add IDynamicTextureManager.ConvertData() to match AsyncConvertData(). Remove mismatching ConvertStream() where there is no AsyncConvertStream and neither IDynamicTextureManager implementer implements this method.

integration
Justin Clark-Casey (justincc) 2012-08-28 20:35:17 +01:00
parent 1e18f0f26a
commit aa44df9c04
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
return null; return null;
} }
public byte[] ConvertStream(Stream data, string extraParams) public byte[] ConvertData(string bodyData, string extraParams)
{ {
return null; return null;
} }

11
OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
View File

@ -78,9 +78,9 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
return null; return null;
} }
public byte[] ConvertStream(Stream data, string extraParams) public byte[] ConvertData(string bodyData, string extraParams)
{ {
return null; return Draw(bodyData, extraParams);
} }
public bool AsyncConvertUrl(UUID id, string url, string extraParams) public bool AsyncConvertUrl(UUID id, string url, string extraParams)
@ -90,7 +90,8 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
public bool AsyncConvertData(UUID id, string bodyData, string extraParams) public bool AsyncConvertData(UUID id, string bodyData, string extraParams)
{ {
Draw(bodyData, id, extraParams); // XXX: This isn't actually being done asynchronously!
m_textureManager.ReturnData(id, ConvertData(bodyData, extraParams));
return true; return true;
} }
@ -161,7 +162,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
#endregion #endregion
private void Draw(string data, UUID id, string extraParams) private byte[] 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 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 will now support multiple comma seperated params in the form width:256,height:512,alpha:255
@ -358,7 +359,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
e.Message, e.StackTrace); e.Message, e.StackTrace);
} }
m_textureManager.ReturnData(id, imageJ2000); return imageJ2000;
} }
finally finally
{ {

2
OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs
View File

@ -114,7 +114,7 @@ namespace OpenSim.Region.Framework.Interfaces
string GetContentType(); string GetContentType();
bool SupportsAsynchronous(); bool SupportsAsynchronous();
byte[] ConvertUrl(string url, string extraParams); byte[] ConvertUrl(string url, string extraParams);
byte[] ConvertStream(Stream data, string extraParams); byte[] ConvertData(string bodyData, string extraParams);
bool AsyncConvertUrl(UUID id, string url, string extraParams); bool AsyncConvertUrl(UUID id, string url, string extraParams);
bool AsyncConvertData(UUID id, string bodyData, string extraParams); bool AsyncConvertData(UUID id, string bodyData, string extraParams);
void GetDrawStringSize(string text, string fontName, int fontSize, void GetDrawStringSize(string text, string fontName, int fontSize,