Changeset 400dfb2 in rtems

Timestamp:

Oct 28, 2005, 7:22:49 AM (15 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

0546a124

Parents:

d26ab242 (diff), d1fd7e5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

This commit was generated by cvs2svn to compensate for changes in r12484,
which included commits to RCS files with non-trunk default branches.

Location:

cpukit/zlib/contrib/dotzlib

Files:

• DotZLib.chm (modified) (previous)
• DotZLib/CodecBase.cs (modified) (4 diffs)
• DotZLib/Inflater.cs (modified) (3 diffs)

cpukit/zlib/contrib/dotzlib/DotZLib/CodecBase.cs

@@ -2 +2 @@
 // © 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)
 //
@@ -20 +20 @@
 
         /// <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>
@@ -46 +46 @@
 
         /// <summary>
-        /// Initializes a new instance of the <c>CodeBase</c> class. 
+        /// Initializes a new instance of the <c>CodeBase</c> class.
         /// </summary>
                 public CodecBase()
@@ -78 +78 @@
             {
                 if (DataAvailable != null)
-                    DataAvailable( _outBuffer, 0, (int)_ztream.total_out); 
+                    DataAvailable( _outBuffer, 0, (int)_ztream.total_out);
                 resetOutput();
             }

cpukit/zlib/contrib/dotzlib/DotZLib/Inflater.cs

@@ -2 +2 @@
 // © 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)
 //
@@ -12 +12 @@
 namespace DotZLib
 {
-    
+
     /// <summary>
     /// Implements a data decompressor, using the inflate algorithm in the ZLib dll
@@ -85 +85 @@
         {
             int err;
-            do 
+            do
             {
                 err = inflate(ref _ztream, (int)FlushTypes.Finish);