diff --git a/CSJ2K/CSJ2K.csproj b/CSJ2K/CSJ2K.csproj index 494e2832..a9e396ac 100644 --- a/CSJ2K/CSJ2K.csproj +++ b/CSJ2K/CSJ2K.csproj @@ -62,16 +62,7 @@ AnyCPU - - System - False - - - System.Drawing - False - - - + diff --git a/CSJ2K/J2KEncoder.cs b/CSJ2K/J2KEncoder.cs index 614bf8e1..5d8ea1bd 100644 --- a/CSJ2K/J2KEncoder.cs +++ b/CSJ2K/J2KEncoder.cs @@ -1,24 +1,18 @@ #region Using Statements using System; using System.Collections.Generic; -using System.Drawing; +using System.DrawingCore; using System.IO; using CSJ2K.j2k.quantization.quantizer; using CSJ2K.j2k.image.forwcomptransf; using CSJ2K.j2k.codestream.writer; -using CSJ2K.j2k.fileformat.writer; using CSJ2K.j2k.wavelet.analysis; using CSJ2K.j2k.entropy.encoder; -using CSJ2K.j2k.entropy; -using CSJ2K.j2k.quantization; using CSJ2K.j2k.image.input; using CSJ2K.j2k.roi.encoder; -using CSJ2K.j2k.roi; -using CSJ2K.j2k.codestream; using CSJ2K.j2k.image; using CSJ2K.j2k.util; using CSJ2K.j2k.encoder; -using CSJ2K.j2k; #endregion namespace CSJ2K diff --git a/CSJ2K/Util/BitmapImage.cs b/CSJ2K/Util/BitmapImage.cs index 88b76bbf..386e8e26 100644 --- a/CSJ2K/Util/BitmapImage.cs +++ b/CSJ2K/Util/BitmapImage.cs @@ -3,8 +3,8 @@ namespace CSJ2K.Util { - using System.Drawing; - using System.Drawing.Imaging; + using System.DrawingCore; + using System.DrawingCore.Imaging; internal class BitmapImage : ImageBase { diff --git a/CSJ2K/Util/BitmapImageSource.cs b/CSJ2K/Util/BitmapImageSource.cs index 32b79511..8529c9d9 100644 --- a/CSJ2K/Util/BitmapImageSource.cs +++ b/CSJ2K/Util/BitmapImageSource.cs @@ -4,8 +4,8 @@ namespace CSJ2K.Util { using System; - using System.Drawing; - using System.Drawing.Imaging; + using System.DrawingCore; + using System.DrawingCore.Imaging; using System.Linq; using CSJ2K.j2k.image; diff --git a/CSJ2K/j2k/codestream/reader/FileBitstreamReaderAgent.cs b/CSJ2K/j2k/codestream/reader/FileBitstreamReaderAgent.cs index a116dcce..542ce6c5 100644 --- a/CSJ2K/j2k/codestream/reader/FileBitstreamReaderAgent.cs +++ b/CSJ2K/j2k/codestream/reader/FileBitstreamReaderAgent.cs @@ -532,7 +532,7 @@ namespace CSJ2K.j2k.codestream.reader throw new System.ArgumentException("Specified negative " + "resolution level " + "index: " + targetRes); } } - catch (System.FormatException f) + catch (System.FormatException) { throw new System.ArgumentException("Invalid resolution level " + "index ('-res' option) " + pl.getParameter("res")); } diff --git a/CSJ2K/j2k/image/input/ImgReaderGDI.cs b/CSJ2K/j2k/image/input/ImgReaderGDI.cs index fc00ee55..ff6d9a91 100644 --- a/CSJ2K/j2k/image/input/ImgReaderGDI.cs +++ b/CSJ2K/j2k/image/input/ImgReaderGDI.cs @@ -7,8 +7,8 @@ * */ using System; -using System.Drawing; -using System.Drawing.Imaging; +using System.DrawingCore; +using System.DrawingCore.Imaging; using System.IO; using CSJ2K.j2k.image; using CSJ2K.j2k.io; diff --git a/LibreMetaverse.GUI/Properties/AssemblyInfo.cs b/LibreMetaverse.GUI/Properties/AssemblyInfo.cs index 49979e0b..33fb90f2 100644 --- a/LibreMetaverse.GUI/Properties/AssemblyInfo.cs +++ b/LibreMetaverse.GUI/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("1.0.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.csproj b/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.csproj index 539402be..0e4e8b74 100644 --- a/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.csproj +++ b/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.csproj @@ -53,20 +53,6 @@ 1591,1574,0419 AnyCPU - - - PrimMesher - False - - - System - False - - - System.Drawing - False - - {89D7A3E5-0000-0000-0000-000000000000} @@ -74,6 +60,7 @@ + diff --git a/LibreMetaverse.Rendering.Meshmerizer/MeshmerizerR.cs b/LibreMetaverse.Rendering.Meshmerizer/MeshmerizerR.cs index 6fc570a8..baa3c4fb 100644 --- a/LibreMetaverse.Rendering.Meshmerizer/MeshmerizerR.cs +++ b/LibreMetaverse.Rendering.Meshmerizer/MeshmerizerR.cs @@ -91,7 +91,7 @@ namespace OpenMetaverse.Rendering /// Sculpt texture /// Level of detail to generate the mesh at /// The generated mesh or null on failure - public SimpleMesh GenerateSimpleSculptMesh(Primitive prim, System.Drawing.Bitmap sculptTexture, DetailLevel lod) + public SimpleMesh GenerateSimpleSculptMesh(Primitive prim, System.DrawingCore.Bitmap sculptTexture, DetailLevel lod) { var faceted = GenerateFacetedSculptMesh(prim, sculptTexture, lod); @@ -186,7 +186,7 @@ namespace OpenMetaverse.Rendering /// routine since all the context for finding teh texture is elsewhere. /// /// The faceted mesh or null if can't do it - public OMVR.FacetedMesh GenerateFacetedSculptMesh(Primitive prim, System.Drawing.Bitmap scupltTexture, DetailLevel lod) + public OMVR.FacetedMesh GenerateFacetedSculptMesh(Primitive prim, System.DrawingCore.Bitmap scupltTexture, DetailLevel lod) { PrimMesher.SculptMesh.SculptType smSculptType; switch (prim.Sculpt.Type) diff --git a/LibreMetaverse.Rendering.Meshmerizer/Properties/AssemblyInfo.cs b/LibreMetaverse.Rendering.Meshmerizer/Properties/AssemblyInfo.cs index 182e4ae5..8cc6f740 100644 --- a/LibreMetaverse.Rendering.Meshmerizer/Properties/AssemblyInfo.cs +++ b/LibreMetaverse.Rendering.Meshmerizer/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("1.0.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/LibreMetaverse.Rendering.Simple/Properties/AssemblyInfo.cs b/LibreMetaverse.Rendering.Simple/Properties/AssemblyInfo.cs index bb16a13a..1b83c6eb 100644 --- a/LibreMetaverse.Rendering.Simple/Properties/AssemblyInfo.cs +++ b/LibreMetaverse.Rendering.Simple/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("1.0.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/LibreMetaverse.Rendering.Simple/SimpleRenderer.cs b/LibreMetaverse.Rendering.Simple/SimpleRenderer.cs index 57c9a91c..23aa3165 100644 --- a/LibreMetaverse.Rendering.Simple/SimpleRenderer.cs +++ b/LibreMetaverse.Rendering.Simple/SimpleRenderer.cs @@ -47,7 +47,7 @@ namespace OpenMetaverse.Rendering return mesh; } - public SimpleMesh GenerateSimpleSculptMesh(Primitive prim, System.Drawing.Bitmap sculptTexture, DetailLevel lod) + public SimpleMesh GenerateSimpleSculptMesh(Primitive prim, System.DrawingCore.Bitmap sculptTexture, DetailLevel lod) { return GenerateSimpleMesh(prim, lod); } @@ -66,7 +66,7 @@ namespace OpenMetaverse.Rendering return mesh; } - public FacetedMesh GenerateFacetedSculptMesh(Primitive prim, System.Drawing.Bitmap sculptTexture, DetailLevel lod) + public FacetedMesh GenerateFacetedSculptMesh(Primitive prim, System.DrawingCore.Bitmap sculptTexture, DetailLevel lod) { return GenerateFacetedMesh(prim, lod); } diff --git a/LibreMetaverse.Utilities/LibreMetaverse.Utilities.csproj b/LibreMetaverse.Utilities/LibreMetaverse.Utilities.csproj index 0224c81a..81f7e2db 100644 --- a/LibreMetaverse.Utilities/LibreMetaverse.Utilities.csproj +++ b/LibreMetaverse.Utilities/LibreMetaverse.Utilities.csproj @@ -52,20 +52,6 @@ 1591,1574,0419 AnyCPU - - - System - False - - - System.Data - False - - - System.Xml - False - - diff --git a/LibreMetaverse.Utilities/Properties/AssemblyInfo.cs b/LibreMetaverse.Utilities/Properties/AssemblyInfo.cs index 335023b9..8afe89e7 100644 --- a/LibreMetaverse.Utilities/Properties/AssemblyInfo.cs +++ b/LibreMetaverse.Utilities/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs b/Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs index 5322bcae..d9bf096f 100644 --- a/Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs +++ b/Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.IO; using System.Threading; -using System.Drawing; -using OpenMetaverse; -using OpenMetaverse.Http; +using System.DrawingCore; using OpenMetaverse.Imaging; namespace OpenMetaverse.TestClient @@ -102,7 +98,7 @@ namespace OpenMetaverse.TestClient if (lowfilename.EndsWith(".tga")) bitmap = LoadTGAClass.LoadTGA(fileName); else - bitmap = (Bitmap)System.Drawing.Image.FromFile(fileName); + bitmap = (Bitmap)System.DrawingCore.Image.FromFile(fileName); int oldwidth = bitmap.Width; int oldheight = bitmap.Height; @@ -112,9 +108,9 @@ namespace OpenMetaverse.TestClient Bitmap resized = new Bitmap(256, 256, bitmap.PixelFormat); Graphics graphics = Graphics.FromImage(resized); - graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality; + graphics.SmoothingMode = System.DrawingCore.Drawing2D.SmoothingMode.HighQuality; graphics.InterpolationMode = - System.Drawing.Drawing2D.InterpolationMode.HighQualityBicubic; + System.DrawingCore.Drawing2D.InterpolationMode.HighQualityBicubic; graphics.DrawImage(bitmap, 0, 0, 256, 256); bitmap.Dispose(); @@ -133,9 +129,9 @@ namespace OpenMetaverse.TestClient Bitmap resized = new Bitmap(newwidth, newheight, bitmap.PixelFormat); Graphics graphics = Graphics.FromImage(resized); - graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality; + graphics.SmoothingMode = System.DrawingCore.Drawing2D.SmoothingMode.HighQuality; graphics.InterpolationMode = - System.Drawing.Drawing2D.InterpolationMode.HighQualityBicubic; + System.DrawingCore.Drawing2D.InterpolationMode.HighQualityBicubic; graphics.DrawImage(bitmap, 0, 0, newwidth, newheight); bitmap.Dispose();