diff options
| author | Melanie | 2009-10-02 19:53:42 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-02 19:53:42 +0100 |
| commit | 9eccea577716ee4331d30d519da389393b8606cd (patch) | |
| tree | 2e3f1ad5892a7e1d1dc0155f1613adab8bcd2690 /OpenSim/Region/Framework/Interfaces | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | Merge branch 'master' into diva-textures (diff) | |
| download | opensim-SC_OLD-9eccea577716ee4331d30d519da389393b8606cd.zip opensim-SC_OLD-9eccea577716ee4331d30d519da389393b8606cd.tar.gz opensim-SC_OLD-9eccea577716ee4331d30d519da389393b8606cd.tar.bz2 opensim-SC_OLD-9eccea577716ee4331d30d519da389393b8606cd.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs b/OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs index b153997..856eb11 100644 --- a/OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs +++ b/OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs | |||
| @@ -30,12 +30,11 @@ using OpenMetaverse.Imaging; | |||
| 30 | 30 | ||
| 31 | namespace OpenSim.Region.Framework.Interfaces | 31 | namespace OpenSim.Region.Framework.Interfaces |
| 32 | { | 32 | { |
| 33 | |||
| 34 | public delegate void DecodedCallback(UUID AssetId, OpenJPEG.J2KLayerInfo[] layers); | 33 | public delegate void DecodedCallback(UUID AssetId, OpenJPEG.J2KLayerInfo[] layers); |
| 35 | 34 | ||
| 36 | public interface IJ2KDecoder | 35 | public interface IJ2KDecoder |
| 37 | { | 36 | { |
| 38 | void decode(UUID AssetId, byte[] assetData, DecodedCallback decodedReturn); | 37 | void BeginDecode(UUID assetID, byte[] j2kData, DecodedCallback callback); |
| 39 | void syncdecode(UUID AssetId, byte[] j2kdata); | 38 | void Decode(UUID assetID, byte[] j2kData); |
| 40 | } | 39 | } |
| 41 | } | 40 | } |