diff --git a/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj b/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj index cf6d7c86..0a679cad 100644 --- a/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj +++ b/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj @@ -55,16 +55,6 @@ - - - System - False - - - System.Xml - False - - diff --git a/LibreMetaverse/Capabilities/CapsBase.cs b/LibreMetaverse/Capabilities/CapsBase.cs index 5413691a..4a7a7331 100644 --- a/LibreMetaverse/Capabilities/CapsBase.cs +++ b/LibreMetaverse/Capabilities/CapsBase.cs @@ -28,7 +28,6 @@ using System; using System.Net; using System.Net.Security; using System.IO; -using System.Text; using System.Threading; using System.Security.Cryptography.X509Certificates; diff --git a/LibreMetaverse/Helpers.cs b/LibreMetaverse/Helpers.cs index b81d55ea..86b88cf9 100644 --- a/LibreMetaverse/Helpers.cs +++ b/LibreMetaverse/Helpers.cs @@ -31,7 +31,7 @@ using System.IO; using System.IO.Compression; using System.Reflection; using OpenMetaverse.StructuredData; -using zlib; +using ComponentAce.Compression.Libs.zlib; namespace OpenMetaverse { diff --git a/LibreMetaverse/Imaging/ManagedImage.cs b/LibreMetaverse/Imaging/ManagedImage.cs index 7a024609..097fa39c 100644 --- a/LibreMetaverse/Imaging/ManagedImage.cs +++ b/LibreMetaverse/Imaging/ManagedImage.cs @@ -25,6 +25,7 @@ */ using System; +using System.DrawingCore; namespace OpenMetaverse.Imaging { @@ -121,14 +122,14 @@ namespace OpenMetaverse.Imaging /// /// /// - public ManagedImage(System.Drawing.Bitmap bitmap) + public ManagedImage(System.DrawingCore.Bitmap bitmap) { Width = bitmap.Width; Height = bitmap.Height; int pixelCount = Width * Height; - if (bitmap.PixelFormat == System.Drawing.Imaging.PixelFormat.Format32bppArgb) + if (bitmap.PixelFormat == System.DrawingCore.Imaging.PixelFormat.Format32bppArgb) { Channels = ImageChannels.Alpha | ImageChannels.Color; Red = new byte[pixelCount]; @@ -136,8 +137,8 @@ namespace OpenMetaverse.Imaging Blue = new byte[pixelCount]; Alpha = new byte[pixelCount]; - System.Drawing.Imaging.BitmapData bd = bitmap.LockBits(new System.Drawing.Rectangle(0, 0, Width, Height), - System.Drawing.Imaging.ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb); + System.DrawingCore.Imaging.BitmapData bd = bitmap.LockBits(new System.DrawingCore.Rectangle(0, 0, Width, Height), + System.DrawingCore.Imaging.ImageLockMode.ReadOnly, System.DrawingCore.Imaging.PixelFormat.Format32bppArgb); unsafe { @@ -155,22 +156,22 @@ namespace OpenMetaverse.Imaging bitmap.UnlockBits(bd); } - else if (bitmap.PixelFormat == System.Drawing.Imaging.PixelFormat.Format16bppGrayScale) + else if (bitmap.PixelFormat == System.DrawingCore.Imaging.PixelFormat.Format16bppGrayScale) { Channels = ImageChannels.Gray; Red = new byte[pixelCount]; throw new NotImplementedException("16bpp grayscale image support is incomplete"); } - else if (bitmap.PixelFormat == System.Drawing.Imaging.PixelFormat.Format24bppRgb) + else if (bitmap.PixelFormat == System.DrawingCore.Imaging.PixelFormat.Format24bppRgb) { Channels = ImageChannels.Color; Red = new byte[pixelCount]; Green = new byte[pixelCount]; Blue = new byte[pixelCount]; - System.Drawing.Imaging.BitmapData bd = bitmap.LockBits(new System.Drawing.Rectangle(0, 0, Width, Height), - System.Drawing.Imaging.ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format24bppRgb); + System.DrawingCore.Imaging.BitmapData bd = bitmap.LockBits(new System.DrawingCore.Rectangle(0, 0, Width, Height), + System.DrawingCore.Imaging.ImageLockMode.ReadOnly, System.DrawingCore.Imaging.PixelFormat.Format24bppRgb); unsafe { @@ -187,15 +188,15 @@ namespace OpenMetaverse.Imaging bitmap.UnlockBits(bd); } - else if (bitmap.PixelFormat == System.Drawing.Imaging.PixelFormat.Format32bppRgb) + else if (bitmap.PixelFormat == System.DrawingCore.Imaging.PixelFormat.Format32bppRgb) { Channels = ImageChannels.Color; Red = new byte[pixelCount]; Green = new byte[pixelCount]; Blue = new byte[pixelCount]; - System.Drawing.Imaging.BitmapData bd = bitmap.LockBits(new System.Drawing.Rectangle(0, 0, Width, Height), - System.Drawing.Imaging.ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppRgb); + System.DrawingCore.Imaging.BitmapData bd = bitmap.LockBits(new System.DrawingCore.Rectangle(0, 0, Width, Height), + System.DrawingCore.Imaging.ImageLockMode.ReadOnly, System.DrawingCore.Imaging.PixelFormat.Format32bppRgb); unsafe { @@ -382,7 +383,7 @@ namespace OpenMetaverse.Imaging /// origin, suitable for feeding directly into OpenGL /// /// A byte array containing raw texture data - public System.Drawing.Bitmap ExportBitmap() + public System.DrawingCore.Bitmap ExportBitmap() { byte[] raw = new byte[Width * Height * 4]; @@ -423,14 +424,14 @@ namespace OpenMetaverse.Imaging } } - System.Drawing.Bitmap b = new System.Drawing.Bitmap( + System.DrawingCore.Bitmap b = new System.DrawingCore.Bitmap( Width, Height, - System.Drawing.Imaging.PixelFormat.Format32bppArgb); + System.DrawingCore.Imaging.PixelFormat.Format32bppArgb); - System.Drawing.Imaging.BitmapData bd = b.LockBits(new System.Drawing.Rectangle(0, 0, b.Width, b.Height), - System.Drawing.Imaging.ImageLockMode.WriteOnly, - System.Drawing.Imaging.PixelFormat.Format32bppArgb); + System.DrawingCore.Imaging.BitmapData bd = b.LockBits(new System.DrawingCore.Rectangle(0, 0, b.Width, b.Height), + System.DrawingCore.Imaging.ImageLockMode.WriteOnly, + System.DrawingCore.Imaging.PixelFormat.Format32bppArgb); System.Runtime.InteropServices.Marshal.Copy(raw, 0, bd.Scan0, Width * Height * 4); diff --git a/LibreMetaverse/Imaging/OpenJPEG.cs b/LibreMetaverse/Imaging/OpenJPEG.cs index 37bc4491..dee8d6ca 100644 --- a/LibreMetaverse/Imaging/OpenJPEG.cs +++ b/LibreMetaverse/Imaging/OpenJPEG.cs @@ -26,8 +26,8 @@ using System; using System.IO; -using System.Drawing; -using System.Drawing.Imaging; +using System.DrawingCore; +using System.DrawingCore.Imaging; using System.Runtime.InteropServices; namespace OpenMetaverse.Imaging diff --git a/LibreMetaverse/Imaging/TGALoader.cs b/LibreMetaverse/Imaging/TGALoader.cs index e3706b57..09594c5c 100644 --- a/LibreMetaverse/Imaging/TGALoader.cs +++ b/LibreMetaverse/Imaging/TGALoader.cs @@ -153,7 +153,7 @@ namespace OpenMetaverse.Imaging } static unsafe void decodeLine( - System.Drawing.Imaging.BitmapData b, + System.DrawingCore.Imaging.BitmapData b, int line, int byp, byte[] data, @@ -197,7 +197,7 @@ namespace OpenMetaverse.Imaging } static void decodeRle( - System.Drawing.Imaging.BitmapData b, + System.DrawingCore.Imaging.BitmapData b, int byp, tgaCD cd, System.IO.BinaryReader br, bool bottomUp) { try @@ -262,7 +262,7 @@ namespace OpenMetaverse.Imaging } static void decodePlain( - System.Drawing.Imaging.BitmapData b, + System.DrawingCore.Imaging.BitmapData b, int byp, tgaCD cd, System.IO.BinaryReader br, bool bottomUp) { int w = b.Width; @@ -280,7 +280,7 @@ namespace OpenMetaverse.Imaging } static void decodeStandard8( - System.Drawing.Imaging.BitmapData b, + System.DrawingCore.Imaging.BitmapData b, tgaHeader hdr, System.IO.BinaryReader br) { @@ -301,7 +301,7 @@ namespace OpenMetaverse.Imaging } static void decodeSpecial16( - System.Drawing.Imaging.BitmapData b, tgaHeader hdr, System.IO.BinaryReader br) + System.DrawingCore.Imaging.BitmapData b, tgaHeader hdr, System.IO.BinaryReader br) { // i must convert the input stream to a sequence of uint values // which I then unpack. @@ -323,7 +323,7 @@ namespace OpenMetaverse.Imaging } static void decodeStandard16( - System.Drawing.Imaging.BitmapData b, + System.DrawingCore.Imaging.BitmapData b, tgaHeader hdr, System.IO.BinaryReader br) { @@ -347,7 +347,7 @@ namespace OpenMetaverse.Imaging } - static void decodeSpecial24(System.Drawing.Imaging.BitmapData b, + static void decodeSpecial24(System.DrawingCore.Imaging.BitmapData b, tgaHeader hdr, System.IO.BinaryReader br) { // i must convert the input stream to a sequence of uint values @@ -369,7 +369,7 @@ namespace OpenMetaverse.Imaging decodePlain(b, 3, cd, br, hdr.ImageSpec.BottomUp); } - static void decodeStandard24(System.Drawing.Imaging.BitmapData b, + static void decodeStandard24(System.DrawingCore.Imaging.BitmapData b, tgaHeader hdr, System.IO.BinaryReader br) { // i must convert the input stream to a sequence of uint values @@ -391,7 +391,7 @@ namespace OpenMetaverse.Imaging decodePlain(b, 3, cd, br, hdr.ImageSpec.BottomUp); } - static void decodeStandard32(System.Drawing.Imaging.BitmapData b, + static void decodeStandard32(System.DrawingCore.Imaging.BitmapData b, tgaHeader hdr, System.IO.BinaryReader br) { // i must convert the input stream to a sequence of uint values @@ -415,7 +415,7 @@ namespace OpenMetaverse.Imaging } - public static System.Drawing.Size GetTGASize(string filename) + public static System.DrawingCore.Size GetTGASize(string filename) { System.IO.FileStream f = System.IO.File.OpenRead(filename); @@ -425,11 +425,11 @@ namespace OpenMetaverse.Imaging header.Read(br); br.Close(); - return new System.Drawing.Size(header.ImageSpec.Width, header.ImageSpec.Height); + return new System.DrawingCore.Size(header.ImageSpec.Width, header.ImageSpec.Height); } - public static System.Drawing.Bitmap LoadTGA(System.IO.Stream source) + public static System.DrawingCore.Bitmap LoadTGA(System.IO.Stream source) { byte[] buffer = new byte[source.Length]; source.Read(buffer, 0, buffer.Length); @@ -454,8 +454,8 @@ namespace OpenMetaverse.Imaging header.ImageSpec.Height > 4096) throw new ArgumentException("Image too large."); - System.Drawing.Bitmap b; - System.Drawing.Imaging.BitmapData bd; + System.DrawingCore.Bitmap b; + System.DrawingCore.Imaging.BitmapData bd; // Create a bitmap for the image. // Only include an alpha layer when the image requires one. @@ -463,25 +463,25 @@ namespace OpenMetaverse.Imaging header.ImageSpec.PixelDepth == 8 || // Assume 8 bit images are alpha only header.ImageSpec.PixelDepth == 32) // Assume 32 bit images are ARGB { // Image needs an alpha layer - b = new System.Drawing.Bitmap( + b = new System.DrawingCore.Bitmap( header.ImageSpec.Width, header.ImageSpec.Height, - System.Drawing.Imaging.PixelFormat.Format32bppArgb); + System.DrawingCore.Imaging.PixelFormat.Format32bppArgb); - bd = b.LockBits(new System.Drawing.Rectangle(0, 0, b.Width, b.Height), - System.Drawing.Imaging.ImageLockMode.WriteOnly, - System.Drawing.Imaging.PixelFormat.Format32bppPArgb); + bd = b.LockBits(new System.DrawingCore.Rectangle(0, 0, b.Width, b.Height), + System.DrawingCore.Imaging.ImageLockMode.WriteOnly, + System.DrawingCore.Imaging.PixelFormat.Format32bppPArgb); } else { // Image does not need an alpha layer, so do not include one. - b = new System.Drawing.Bitmap( + b = new System.DrawingCore.Bitmap( header.ImageSpec.Width, header.ImageSpec.Height, - System.Drawing.Imaging.PixelFormat.Format32bppRgb); + System.DrawingCore.Imaging.PixelFormat.Format32bppRgb); - bd = b.LockBits(new System.Drawing.Rectangle(0, 0, b.Width, b.Height), - System.Drawing.Imaging.ImageLockMode.WriteOnly, - System.Drawing.Imaging.PixelFormat.Format32bppRgb); + bd = b.LockBits(new System.DrawingCore.Rectangle(0, 0, b.Width, b.Height), + System.DrawingCore.Imaging.ImageLockMode.WriteOnly, + System.DrawingCore.Imaging.PixelFormat.Format32bppRgb); } switch (header.ImageSpec.PixelDepth) @@ -546,13 +546,13 @@ namespace OpenMetaverse.Imaging throw new ArgumentException("Image too large."); byte[] decoded = new byte[header.ImageSpec.Width * header.ImageSpec.Height * 4]; - System.Drawing.Imaging.BitmapData bd = new System.Drawing.Imaging.BitmapData(); + System.DrawingCore.Imaging.BitmapData bd = new System.DrawingCore.Imaging.BitmapData(); fixed (byte* pdecoded = &decoded[0]) { bd.Width = header.ImageSpec.Width; bd.Height = header.ImageSpec.Height; - bd.PixelFormat = System.Drawing.Imaging.PixelFormat.Format32bppPArgb; + bd.PixelFormat = System.DrawingCore.Imaging.PixelFormat.Format32bppPArgb; bd.Stride = header.ImageSpec.Width * 4; bd.Scan0 = (IntPtr)pdecoded; @@ -616,7 +616,7 @@ namespace OpenMetaverse.Imaging } } - public static System.Drawing.Bitmap LoadTGA(string filename) + public static System.DrawingCore.Bitmap LoadTGA(string filename) { try { diff --git a/LibreMetaverse/Interfaces/IRendering.cs b/LibreMetaverse/Interfaces/IRendering.cs index b999c805..653bd161 100644 --- a/LibreMetaverse/Interfaces/IRendering.cs +++ b/LibreMetaverse/Interfaces/IRendering.cs @@ -26,7 +26,7 @@ using System; using System.Collections.Generic; -using System.Drawing; +using System.DrawingCore; namespace OpenMetaverse.Rendering { @@ -91,7 +91,7 @@ namespace OpenMetaverse.Rendering /// /// Apply texture coordinate modifications from a - /// to a list of vertices + /// to a list of vertices /// /// Vertex list to modify texture coordinates for /// Center-point of the face diff --git a/LibreMetaverse/LibreMetaverse.csproj b/LibreMetaverse/LibreMetaverse.csproj index b0b10fb2..f918eff0 100644 --- a/LibreMetaverse/LibreMetaverse.csproj +++ b/LibreMetaverse/LibreMetaverse.csproj @@ -50,32 +50,11 @@ 1591,1574,0419 AnyCPU - - - System - False - - - System.Core - False - - - System.Data - False - - - System.Drawing - False - - - System.Xml - False - - + diff --git a/LibreMetaverse/Messages/LindenMessages.cs b/LibreMetaverse/Messages/LindenMessages.cs index 6fc87fba..bc2033f6 100644 --- a/LibreMetaverse/Messages/LindenMessages.cs +++ b/LibreMetaverse/Messages/LindenMessages.cs @@ -28,7 +28,7 @@ using System; using System.Collections.Generic; using System.Net; using System.IO; -using zlib; +using ComponentAce.Compression.Libs.zlib; using OpenMetaverse.StructuredData; using OpenMetaverse.Interfaces; diff --git a/LibreMetaverseTypes/LibreMetaverse.Types.csproj b/LibreMetaverseTypes/LibreMetaverse.Types.csproj index cb3b0a64..69712af5 100644 --- a/LibreMetaverseTypes/LibreMetaverse.Types.csproj +++ b/LibreMetaverseTypes/LibreMetaverse.Types.csproj @@ -50,17 +50,6 @@ 1591,1574,0419 AnyCPU - - - System - False - - - System.Core - False - - -