Merge remote-tracking branch 'origin/released'

Conflicts:
	zlib/Makefile

9 files changed, 50 insertions, 50 deletions

diff --git a/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs b/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs
index 6fc0fdcc2..0491bfc2b 100644
--- a/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs
+++ b/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs
@@ -2,7 +2,7 @@ using System.Reflection;
 using System.Runtime.CompilerServices;

 

 //

-// General Information about an assembly is controlled through the following 

+// General Information about an assembly is controlled through the following

 // set of attributes. Change these attribute values to modify the information

 // associated with an assembly.

 //

@@ -13,42 +13,42 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyProduct("")]

 [assembly: AssemblyCopyright("(c) 2004 by Henrik Ravn")]

 [assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]		

+[assembly: AssemblyCulture("")]

 

 //

 // Version information for an assembly consists of the following four values:

 //

 //      Major Version

-//      Minor Version 

+//      Minor Version

 //      Build Number

 //      Revision

 //

-// You can specify all the values or you can default the Revision and Build Numbers 

+// 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.*")]

 

 //

-// In order to sign your assembly you must specify a key to use. Refer to the 

+// In order to sign your assembly you must specify a key to use. Refer to the

 // Microsoft .NET Framework documentation for more information on assembly signing.

 //

-// Use the attributes below to control which key is used for signing. 

+// Use the attributes below to control which key is used for signing.

 //

-// Notes: 

+// Notes:

 //   (*) If no key is specified, the assembly is not signed.

 //   (*) KeyName refers to a key that has been installed in the Crypto Service

 //       Provider (CSP) on your machine. KeyFile refers to a file which contains

 //       a key.

-//   (*) If the KeyFile and the KeyName values are both specified, the 

+//   (*) If the KeyFile and the KeyName values are both specified, the

 //       following processing occurs:

 //       (1) If the KeyName can be found in the CSP, that key is used.

-//       (2) If the KeyName does not exist and the KeyFile does exist, the key 

+//       (2) If the KeyName does not exist and the KeyFile does exist, the key

 //           in the KeyFile is installed into the CSP and used.

 //   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.

 //       When specifying the KeyFile, the location of the KeyFile should be

 //       relative to the project output directory which is

 //       %Project Directory%\obj\<configuration>. For example, if your KeyFile is

-//       located in the project directory, you would specify the AssemblyKeyFile 

+//       located in the project directory, you would specify the AssemblyKeyFile

 //       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]

 //   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework

 //       documentation for more information on this.

diff --git a/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs b/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs
index dfe7e90a8..788b2fcec 100644
--- a/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs
+++ b/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs
@@ -1,7 +1,7 @@
 //

 // © Copyright Henrik Ravn 2004

 //

-// Use, modification and distribution are subject to the Boost Software License, Version 1.0. 

+// Use, modification and distribution are subject to the Boost Software License, Version 1.0.

 // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

 //

 

@@ -25,7 +25,7 @@ namespace DotZLib
         protected uint _current;

 

         /// <summary>

-        /// Initializes a new instance of the checksum generator base - the current checksum is 

+        /// Initializes a new instance of the checksum generator base - the current checksum is

         /// set to zero

         /// </summary>

         public ChecksumGeneratorBase()

@@ -61,7 +61,7 @@ namespace DotZLib
         /// <exception cref="ArgumentException">The sum of offset and count is larger than the length of <c>data</c></exception>

         /// <exception cref="NullReferenceException"><c>data</c> is a null reference</exception>

         /// <exception cref="ArgumentOutOfRangeException">Offset or count is negative.</exception>

-        /// <remarks>All the other <c>Update</c> methods are implmeneted in terms of this one. 

+        /// <remarks>All the other <c>Update</c> methods are implmeneted in terms of this one.

         /// This is therefore the only method a derived class has to implement</remarks>

         public abstract void Update(byte[] data, int offset, int count);

 

@@ -101,7 +101,7 @@ namespace DotZLib
     /// <summary>

     /// Implements a CRC32 checksum generator

     /// </summary>

-    public sealed class CRC32Checksum : ChecksumGeneratorBase    

+    public sealed class CRC32Checksum : ChecksumGeneratorBase

     {

         #region DLL imports

 

@@ -152,7 +152,7 @@ namespace DotZLib
     /// <summary>

     /// Implements a checksum generator that computes the Adler checksum on data

     /// </summary>

-    public sealed class AdlerChecksum : ChecksumGeneratorBase    

+    public sealed class AdlerChecksum : ChecksumGeneratorBase

     {

         #region DLL imports

 

diff --git a/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs b/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs
index 16997e906..c1cab3a02 100644
--- a/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs
+++ b/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs
@@ -1,7 +1,7 @@
 //

 // © Copyright Henrik Ravn 2004

 //

-// Use, modification and distribution are subject to the Boost Software License, Version 1.0. 

+// Use, modification and distribution are subject to the Boost Software License, Version 1.0.

 // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

 //

 

@@ -25,7 +25,7 @@ namespace DotZLib
         #endregion

 

         public CircularBuffer(int capacity)

-        {    

+        {

             Debug.Assert( capacity > 0 );

             _buffer = new byte[capacity];

             _capacity = capacity;

diff --git a/zlib/contrib/dotzlib/DotZLib/CodecBase.cs b/zlib/contrib/dotzlib/DotZLib/CodecBase.cs
index 954db7db0..42e6da3a5 100644
--- a/zlib/contrib/dotzlib/DotZLib/CodecBase.cs
+++ b/zlib/contrib/dotzlib/DotZLib/CodecBase.cs
@@ -1,7 +1,7 @@
 //

 // © Copyright Henrik Ravn 2004

 //

-// Use, modification and distribution are subject to the Boost Software License, Version 1.0. 

+// Use, modification and distribution are subject to the Boost Software License, Version 1.0.

 // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

 //

 

@@ -19,7 +19,7 @@ namespace DotZLib
         #region Data members

 

         /// <summary>

-        /// Instance of the internal zlib buffer structure that is 

+        /// Instance of the internal zlib buffer structure that is

         /// passed to all functions in the zlib dll

         /// </summary>

         internal ZStream _ztream = new ZStream();

@@ -45,7 +45,7 @@ namespace DotZLib
         #endregion

 

         /// <summary>

-        /// Initializes a new instance of the <c>CodeBase</c> class. 

+        /// Initializes a new instance of the <c>CodeBase</c> class.

         /// </summary>

 		public CodecBase()

 		{

@@ -77,7 +77,7 @@ namespace DotZLib
             if (_ztream.total_out > 0)

             {

                 if (DataAvailable != null)

-                    DataAvailable( _outBuffer, 0, (int)_ztream.total_out); 

+                    DataAvailable( _outBuffer, 0, (int)_ztream.total_out);

                 resetOutput();

             }

         }

diff --git a/zlib/contrib/dotzlib/DotZLib/Deflater.cs b/zlib/contrib/dotzlib/DotZLib/Deflater.cs
index d7b8dccca..c2477925b 100644
--- a/zlib/contrib/dotzlib/DotZLib/Deflater.cs
+++ b/zlib/contrib/dotzlib/DotZLib/Deflater.cs
@@ -1,7 +1,7 @@
 //

 // © Copyright Henrik Ravn 2004

 //

-// Use, modification and distribution are subject to the Boost Software License, Version 1.0. 

+// Use, modification and distribution are subject to the Boost Software License, Version 1.0.

 // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

 //

 

@@ -56,7 +56,7 @@ namespace DotZLib
             if (data == null) throw new ArgumentNullException();

             if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();

             if ((offset+count) > data.Length) throw new ArgumentException();

-            

+

             int total = count;

             int inputIndex = offset;

             int err = 0;

@@ -86,7 +86,7 @@ namespace DotZLib
         public override void Finish()

         {

             int err;

-            do 

+            do

             {

                 err = deflate(ref _ztream, (int)FlushTypes.Finish);

                 OnDataAvailable();

diff --git a/zlib/contrib/dotzlib/DotZLib/DotZLib.cs b/zlib/contrib/dotzlib/DotZLib/DotZLib.cs
index 410deb088..be184b4c7 100644
--- a/zlib/contrib/dotzlib/DotZLib/DotZLib.cs
+++ b/zlib/contrib/dotzlib/DotZLib/DotZLib.cs
@@ -1,7 +1,7 @@
 //

 // © Copyright Henrik Ravn 2004

 //

-// Use, modification and distribution are subject to the Boost Software License, Version 1.0. 

+// Use, modification and distribution are subject to the Boost Software License, Version 1.0.

 // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

 //

 

@@ -19,7 +19,7 @@ namespace DotZLib
     /// <summary>

     /// Defines constants for the various flush types used with zlib

     /// </summary>

-    internal enum FlushTypes 

+    internal enum FlushTypes

     {

         None,  Partial,  Sync,  Full,  Finish,  Block

     }

@@ -38,7 +38,7 @@ namespace DotZLib
         public uint total_out;

 

         [MarshalAs(UnmanagedType.LPStr)]

-        string msg; 

+        string msg;

         uint state;

 

         uint zalloc;

@@ -51,7 +51,7 @@ namespace DotZLib
     }

 

     #endregion

-    

+

     #endregion

 

     #region Public enums

@@ -63,7 +63,7 @@ namespace DotZLib
         /// <summary>

         /// The default compression level with a reasonable compromise between compression and speed

         /// </summary>

-        Default = -1,   

+        Default = -1,

         /// <summary>

         /// No compression at all. The data are passed straight through.

         /// </summary>

@@ -71,7 +71,7 @@ namespace DotZLib
         /// <summary>

         /// The maximum compression rate available.

         /// </summary>

-        Best = 9,   

+        Best = 9,

         /// <summary>

         /// The fastest available compression level.

         /// </summary>

@@ -86,7 +86,7 @@ namespace DotZLib
     public class ZLibException : ApplicationException

     {

         /// <summary>

-        /// Initializes a new instance of the <see cref="ZLibException"/> class with a specified 

+        /// Initializes a new instance of the <see cref="ZLibException"/> class with a specified

         /// error message and error code

         /// </summary>

         /// <param name="errorCode">The zlib error code that caused the exception</param>

@@ -96,7 +96,7 @@ namespace DotZLib
         }

 

         /// <summary>

-        /// Initializes a new instance of the <see cref="ZLibException"/> class with a specified 

+        /// Initializes a new instance of the <see cref="ZLibException"/> class with a specified

         /// error code

         /// </summary>

         /// <param name="errorCode">The zlib error code that caused the exception</param>

@@ -109,7 +109,7 @@ namespace DotZLib
     #region Interfaces

 

     /// <summary>

-    /// Declares methods and properties that enables a running checksum to be calculated 

+    /// Declares methods and properties that enables a running checksum to be calculated

     /// </summary>

     public interface ChecksumGenerator

     {

@@ -163,7 +163,7 @@ namespace DotZLib
     /// <paramref name="data">The byte array containing the processed data</paramref>

     /// <paramref name="startIndex">The index of the first processed byte in <c>data</c></paramref>

     /// <paramref name="count">The number of processed bytes available</paramref>

-    /// <remarks>On return from this method, the data may be overwritten, so grab it while you can. 

+    /// <remarks>On return from this method, the data may be overwritten, so grab it while you can.

     /// You cannot assume that startIndex will be zero.

     /// </remarks>

     public delegate void DataAvailableHandler(byte[] data, int startIndex, int count);

diff --git a/zlib/contrib/dotzlib/DotZLib/GZipStream.cs b/zlib/contrib/dotzlib/DotZLib/GZipStream.cs
index f861675b5..b161300b1 100644
--- a/zlib/contrib/dotzlib/DotZLib/GZipStream.cs
+++ b/zlib/contrib/dotzlib/DotZLib/GZipStream.cs
@@ -1,7 +1,7 @@
 //

 // © Copyright Henrik Ravn 2004

 //

-// Use, modification and distribution are subject to the Boost Software License, Version 1.0. 

+// Use, modification and distribution are subject to the Boost Software License, Version 1.0.

 // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

 //

 

@@ -84,7 +84,7 @@ namespace DotZLib
                 return !_isWriting;

             }

         }

-    

+

 

         /// <summary>

         /// Returns false.

@@ -96,7 +96,7 @@ namespace DotZLib
                 return false;

             }

         }

-    

+

         /// <summary>

         /// Returns true if this tsream is writeable, false otherwise

         /// </summary>

@@ -108,7 +108,7 @@ namespace DotZLib
             }

         }

         #endregion

-    

+

         #region Destructor & IDispose stuff

 

         /// <summary>

@@ -137,7 +137,7 @@ namespace DotZLib
             }

         }

         #endregion

-    

+

         #region Basic reading and writing

         /// <summary>

         /// Attempts to read a number of bytes from the stream.

@@ -244,7 +244,7 @@ namespace DotZLib
         {

             throw new NotSupportedException();

         }

-    

+

         /// <summary>

         ///  Not suppported.

         /// </summary>

@@ -256,7 +256,7 @@ namespace DotZLib
         {

             throw new NotSupportedException();

         }

-    

+

         /// <summary>

         /// Flushes the <c>GZipStream</c>.

         /// </summary>

@@ -266,7 +266,7 @@ namespace DotZLib
         {

             // left empty on purpose

         }

-    

+

         /// <summary>

         /// Gets/sets the current position in the <c>GZipStream</c>. Not suppported.

         /// </summary>

@@ -283,7 +283,7 @@ namespace DotZLib
                 throw new NotSupportedException();

             }

         }

-    

+

         /// <summary>

         /// Gets the size of the stream. Not suppported.

         /// </summary>

diff --git a/zlib/contrib/dotzlib/DotZLib/Inflater.cs b/zlib/contrib/dotzlib/DotZLib/Inflater.cs
index 4e60cda07..8ed5451d6 100644
--- a/zlib/contrib/dotzlib/DotZLib/Inflater.cs
+++ b/zlib/contrib/dotzlib/DotZLib/Inflater.cs
@@ -1,7 +1,7 @@
 //

 // © Copyright Henrik Ravn 2004

 //

-// Use, modification and distribution are subject to the Boost Software License, Version 1.0. 

+// Use, modification and distribution are subject to the Boost Software License, Version 1.0.

 // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

 //

 

@@ -11,7 +11,7 @@ using System.Runtime.InteropServices;
 

 namespace DotZLib

 {

-    

+

     /// <summary>

     /// Implements a data decompressor, using the inflate algorithm in the ZLib dll

     /// </summary>

@@ -84,7 +84,7 @@ namespace DotZLib
         public override void Finish()

         {

             int err;

-            do 

+            do

             {

                 err = inflate(ref _ztream, (int)FlushTypes.Finish);

                 OnDataAvailable();

diff --git a/zlib/contrib/dotzlib/DotZLib/UnitTests.cs b/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
index 8dc00db92..109028841 100644
--- a/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
+++ b/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
@@ -1,7 +1,7 @@
 //

 // © Copyright Henrik Ravn 2004

 //

-// Use, modification and distribution are subject to the Boost Software License, Version 1.0. 

+// Use, modification and distribution are subject to the Boost Software License, Version 1.0.

 // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

 //

 

@@ -156,7 +156,7 @@ namespace DotZLibTests
         public void Info_Version()

         {

             Info info = new Info();

-            Assert.AreEqual("1.2.3", Info.Version);

+            Assert.AreEqual("1.2.7", Info.Version);

             Assert.AreEqual(32, info.SizeOfUInt);

             Assert.AreEqual(32, info.SizeOfULong);

             Assert.AreEqual(32, info.SizeOfPointer);

@@ -225,7 +225,7 @@ namespace DotZLibTests
 

         [Test]

         public void Inflate_Expand()

-        { 

+        {

             uncompressedData.Clear();

 

             using (Inflater inf = new Inflater())

@@ -271,4 +271,4 @@ namespace DotZLibTests
 	}

 }

 

-#endif
\ No newline at end of file
+#endif