From d71c75e033eb2be3f47dbac3290eba00313589c3 Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Thu, 18 Apr 2013 00:56:05 -0400 Subject: [PATCH] Internalizing Ionic.Zlib classes --- SubstrateCS/Vendor/DotNetZip/Zlib/Crc32.cs | 4 ++-- SubstrateCS/Vendor/DotNetZip/Zlib/Deflate.cs | 2 +- SubstrateCS/Vendor/DotNetZip/Zlib/DeflateStream.cs | 2 +- SubstrateCS/Vendor/DotNetZip/Zlib/GZipStream.cs | 2 +- .../Vendor/DotNetZip/Zlib/ParallelDeflateOutputStream.cs | 2 +- SubstrateCS/Vendor/DotNetZip/Zlib/Zlib.cs | 8 ++++---- SubstrateCS/Vendor/DotNetZip/Zlib/ZlibCodec.cs | 2 +- SubstrateCS/Vendor/DotNetZip/Zlib/ZlibConstants.cs | 2 +- SubstrateCS/Vendor/DotNetZip/Zlib/ZlibStream.cs | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/SubstrateCS/Vendor/DotNetZip/Zlib/Crc32.cs b/SubstrateCS/Vendor/DotNetZip/Zlib/Crc32.cs index c5dc0f3..4d685d5 100644 --- a/SubstrateCS/Vendor/DotNetZip/Zlib/Crc32.cs +++ b/SubstrateCS/Vendor/DotNetZip/Zlib/Crc32.cs @@ -52,7 +52,7 @@ namespace Ionic.Zlib #if !NETCF [Interop.ClassInterface(Interop.ClassInterfaceType.AutoDispatch)] #endif - public class CRC32 + internal class CRC32 { /// /// indicates the total number of bytes read on the CRC stream. @@ -322,7 +322,7 @@ namespace Ionic.Zlib /// DotNetZip library. /// /// - public class CrcCalculatorStream : System.IO.Stream, System.IDisposable + internal class CrcCalculatorStream : System.IO.Stream, System.IDisposable { private static readonly Int64 UnsetLengthLimit = -99; diff --git a/SubstrateCS/Vendor/DotNetZip/Zlib/Deflate.cs b/SubstrateCS/Vendor/DotNetZip/Zlib/Deflate.cs index d04f5d7..652c2dd 100644 --- a/SubstrateCS/Vendor/DotNetZip/Zlib/Deflate.cs +++ b/SubstrateCS/Vendor/DotNetZip/Zlib/Deflate.cs @@ -78,7 +78,7 @@ namespace Ionic.Zlib /// /// The different FlushType values are useful when using a Deflate in a streaming application. /// - public enum FlushType + internal enum FlushType { /// No flush at all. None = 0, diff --git a/SubstrateCS/Vendor/DotNetZip/Zlib/DeflateStream.cs b/SubstrateCS/Vendor/DotNetZip/Zlib/DeflateStream.cs index de4bea9..2fe7a7c 100644 --- a/SubstrateCS/Vendor/DotNetZip/Zlib/DeflateStream.cs +++ b/SubstrateCS/Vendor/DotNetZip/Zlib/DeflateStream.cs @@ -59,7 +59,7 @@ namespace Ionic.Zlib /// /// /// - public class DeflateStream : System.IO.Stream + internal class DeflateStream : System.IO.Stream { internal ZlibBaseStream _baseStream; internal System.IO.Stream _innerStream; diff --git a/SubstrateCS/Vendor/DotNetZip/Zlib/GZipStream.cs b/SubstrateCS/Vendor/DotNetZip/Zlib/GZipStream.cs index e658b5f..fbbaf2e 100644 --- a/SubstrateCS/Vendor/DotNetZip/Zlib/GZipStream.cs +++ b/SubstrateCS/Vendor/DotNetZip/Zlib/GZipStream.cs @@ -81,7 +81,7 @@ namespace Ionic.Zlib /// /// /// - public class GZipStream : System.IO.Stream + internal class GZipStream : System.IO.Stream { // GZip format // source: http://tools.ietf.org/html/rfc1952 diff --git a/SubstrateCS/Vendor/DotNetZip/Zlib/ParallelDeflateOutputStream.cs b/SubstrateCS/Vendor/DotNetZip/Zlib/ParallelDeflateOutputStream.cs index 77e8c39..b469588 100644 --- a/SubstrateCS/Vendor/DotNetZip/Zlib/ParallelDeflateOutputStream.cs +++ b/SubstrateCS/Vendor/DotNetZip/Zlib/ParallelDeflateOutputStream.cs @@ -90,7 +90,7 @@ namespace Ionic.Zlib /// /// /// - public class ParallelDeflateOutputStream : System.IO.Stream + internal class ParallelDeflateOutputStream : System.IO.Stream { private static readonly int IO_BUFFER_SIZE_DEFAULT = 64 * 1024; // 128k diff --git a/SubstrateCS/Vendor/DotNetZip/Zlib/Zlib.cs b/SubstrateCS/Vendor/DotNetZip/Zlib/Zlib.cs index e166792..2692015 100644 --- a/SubstrateCS/Vendor/DotNetZip/Zlib/Zlib.cs +++ b/SubstrateCS/Vendor/DotNetZip/Zlib/Zlib.cs @@ -73,7 +73,7 @@ namespace Ionic.Zlib /// /// The compression level to be used when using a DeflateStream or ZlibStream with CompressionMode.Compress. /// - public enum CompressionLevel + internal enum CompressionLevel { /// /// None means that the data will be simply stored, with no change at all. @@ -152,7 +152,7 @@ namespace Ionic.Zlib /// work better on different sorts of data. The strategy parameter can affect the compression /// ratio and the speed of compression but not the correctness of the compresssion. /// - public enum CompressionStrategy + internal enum CompressionStrategy { /// /// The default strategy is probably the best for normal data. @@ -179,7 +179,7 @@ namespace Ionic.Zlib /// /// An enum to specify the direction of transcoding - whether to compress or decompress. /// - public enum CompressionMode + internal enum CompressionMode { /// /// Used to specify that the stream should compress the data. @@ -196,7 +196,7 @@ namespace Ionic.Zlib /// A general purpose exception class for exceptions in the Zlib library. /// [Interop.GuidAttribute("ebc25cf6-9120-4283-b972-0e5520d0000E")] - public class ZlibException : System.Exception + internal class ZlibException : System.Exception { /// /// The ZlibException class captures exception information generated diff --git a/SubstrateCS/Vendor/DotNetZip/Zlib/ZlibCodec.cs b/SubstrateCS/Vendor/DotNetZip/Zlib/ZlibCodec.cs index ab0abcf..62f2546 100644 --- a/SubstrateCS/Vendor/DotNetZip/Zlib/ZlibCodec.cs +++ b/SubstrateCS/Vendor/DotNetZip/Zlib/ZlibCodec.cs @@ -84,7 +84,7 @@ namespace Ionic.Zlib #if !NETCF [Interop.ClassInterface(Interop.ClassInterfaceType.AutoDispatch)] #endif - sealed public class ZlibCodec + sealed internal class ZlibCodec { /// /// The buffer from which data is taken. diff --git a/SubstrateCS/Vendor/DotNetZip/Zlib/ZlibConstants.cs b/SubstrateCS/Vendor/DotNetZip/Zlib/ZlibConstants.cs index 59ae730..d015b70 100644 --- a/SubstrateCS/Vendor/DotNetZip/Zlib/ZlibConstants.cs +++ b/SubstrateCS/Vendor/DotNetZip/Zlib/ZlibConstants.cs @@ -68,7 +68,7 @@ namespace Ionic.Zlib /// /// A bunch of constants used in the Zlib interface. /// - public static class ZlibConstants + internal static class ZlibConstants { /// /// The maximum number of window bits for the Deflate algorithm. diff --git a/SubstrateCS/Vendor/DotNetZip/Zlib/ZlibStream.cs b/SubstrateCS/Vendor/DotNetZip/Zlib/ZlibStream.cs index 7b0b17f..0357c7a 100644 --- a/SubstrateCS/Vendor/DotNetZip/Zlib/ZlibStream.cs +++ b/SubstrateCS/Vendor/DotNetZip/Zlib/ZlibStream.cs @@ -68,7 +68,7 @@ namespace Ionic.Zlib /// /// /// - public class ZlibStream : System.IO.Stream + internal class ZlibStream : System.IO.Stream { internal ZlibBaseStream _baseStream; bool _disposed;