aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
diff options
context:
space:
mode:
authorJohn Hurliman2009-09-30 12:18:22 -0700
committerMelanie2009-09-30 19:26:53 +0100
commitf56dc5fcda16d96a309120b2a75a623cf455a8e8 (patch)
treecd86ef9956054404ee784f119593dd9c569d9572 /OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
parentRevert "Attempting to improve the robustness of texture decoding by always ig... (diff)
downloadopensim-SC_OLD-f56dc5fcda16d96a309120b2a75a623cf455a8e8.zip
opensim-SC_OLD-f56dc5fcda16d96a309120b2a75a623cf455a8e8.tar.gz
opensim-SC_OLD-f56dc5fcda16d96a309120b2a75a623cf455a8e8.tar.bz2
opensim-SC_OLD-f56dc5fcda16d96a309120b2a75a623cf455a8e8.tar.xz
Attempting to improve the robustness of texture decoding by always ignoring LayerInfo.End values and creating guessed default layer boundaries on failed decodes Changed a noisy J2K decode log message from Info to Debug Replacing openjpeg-dotnet decoding with managed CSJ2K decoding. Should be much more reliable, faster, and use less memory
* Re-added openjpeg-dotnet files since they are used elsewhere in OpenSim * Updated prebuild.xml with a reference to CSJ2K * Renamed IJ2KDecoder and J2KDecoder member names to follow standard naming conventions * Removed j2kDecodeCache cruft and replaced it with the OpenSim cache system * Rewrote the default layer boundary algorithm to use percentages instead of an exponent * Switched from an infinite in-memory cache to an expiring cache (10 minute timeout) * Slightly quieted logging errors for failed texture decodes
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
index b186720..45286be 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
@@ -351,7 +351,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
351 J2KDecodedCallback(m_requestedUUID, new OpenJPEG.J2KLayerInfo[0]); 351 J2KDecodedCallback(m_requestedUUID, new OpenJPEG.J2KLayerInfo[0]);
352 } 352 }
353 // Send it off to the jpeg decoder 353 // Send it off to the jpeg decoder
354 m_j2kDecodeModule.decode(m_requestedUUID, Data, J2KDecodedCallback); 354 m_j2kDecodeModule.BeginDecode(m_requestedUUID, Data, J2KDecodedCallback);
355 355
356 } 356 }
357 else 357 else