From 7d89e122930be39e84a6d174548fa2d12ac0484a Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sat, 6 Sep 2008 07:52:41 +0000
Subject: * This is the fabled LibOMV update with all of the libOMV types from
 JHurliman * This is a HUGE OMG update and will definitely have unknown side
 effects.. so this is really only for the strong hearted at this point. 
 Regular people should let the dust settle. * This has been tested to work
 with most basic functions. However..   make sure you back up 'everything'
 before using this.  It's that big! * Essentially we're back at square 1 in
 the testing phase..  so lets identify things that broke.

---
 OpenSim/Region/Physics/Meshing/SculptMesh.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Physics/Meshing/SculptMesh.cs')

diff --git a/OpenSim/Region/Physics/Meshing/SculptMesh.cs b/OpenSim/Region/Physics/Meshing/SculptMesh.cs
index 360b2f7..707c0e3 100644
--- a/OpenSim/Region/Physics/Meshing/SculptMesh.cs
+++ b/OpenSim/Region/Physics/Meshing/SculptMesh.cs
@@ -30,14 +30,14 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Text;
-using OpenJPEGNet;
-using Image = System.Drawing.Image;
+using OpenMetaverse.Imaging;
 
 namespace OpenSim.Region.Physics.Meshing
 {
     // This functionality based on the XNA SculptPreview by John Hurliman.
     public class SculptMesh : Mesh
     {
+        ManagedImage managedImage;
         Image idata = null;
         Bitmap bLOD = null;
         Bitmap bBitmap = null;
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Physics.Meshing
 
             try
             {
-                idata = OpenJPEG.DecodeToImage(jpegData);
+                OpenJPEG.DecodeToImage(jpegData, out managedImage, out idata);
                 //int i = 0;
                 //i = i / i;
             }
@@ -64,6 +64,7 @@ namespace OpenSim.Region.Physics.Meshing
                 System.Console.WriteLine("[PHYSICS]: Unable to generate a Sculpty physics proxy.  Sculpty texture decode failed!");
                 return;
             }
+
             if (idata != null)
             {
                 bBitmap = new Bitmap(idata);
-- 
cgit v1.1