Use BitArray for codeword blocks

Author: Shane32

QRCoder/Extensions/BitArrayExtensions.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Collections;
+using System.Linq;
+using System.Text;
+
+namespace QRCoder
+{
+    /// <summary>
+    /// Helper methods for <see cref="BitArray"/>.
+    /// </summary>
+    internal static class BitArrayExtensions
+    {
+        /// Copies a specified number of elements from one <see cref="BitArray"/> to another starting at the specified offsets.
+        /// </summary>
+        /// <param name="source">The source <see cref="BitArray"/> from which elements will be copied.</param>
+        /// <param name="sourceOffset">The zero-based index in the source <see cref="BitArray"/> at which copying begins.</param>
+        /// <param name="destination">The destination <see cref="BitArray"/> to which elements will be copied.</param>
+        /// <param name="destinationOffset">The zero-based index in the destination <see cref="BitArray"/> at which storing begins.</param>
+        /// <param name="count">The number of elements to copy.</param>
+        /// <returns>The index in the destination <see cref="BitArray"/> immediately following the last copied element.</returns>
+        public static int CopyTo(this BitArray source, int sourceOffset, BitArray destination, int destinationOffset, int count)
+        {
+            for (int i = 0; i < count; i++)
+            {
+                destination[destinationOffset + i] = source[sourceOffset + i];
+            }
+            return destinationOffset + count;
+        }
+
+        /// <summary>
+        /// Copies a specified number of elements from one <see cref="BitArray"/> to another starting at the specified offsets,
+        /// and reverses every set of 8 bits during the copy operation.
+        /// </summary>
+        /// <param name="source">The source <see cref="BitArray"/> from which elements will be copied.</param>
+        /// <param name="sourceOffset">The zero-based index in the source <see cref="BitArray"/> at which copying begins.</param>
+        /// <param name="destination">The destination <see cref="BitArray"/> to which elements will be copied.</param>
+        /// <param name="destinationOffset">The zero-based index in the destination <see cref="BitArray"/> at which storing begins.</param>
+        /// <param name="count">The number of elements to copy. Must be a multiple of 8.</param>
+        /// <returns>The index in the destination <see cref="BitArray"/> immediately following the last copied element.</returns>
+        public static int CopyToRev8(this BitArray source, int sourceOffset, BitArray destination, int destinationOffset, int count)
+        {
+            if (count % 8 != 0)
+            {
+                throw new ArgumentException("Count must be a multiple of 8.", nameof(count));
+            }
+
+            for (int i = 0; i < count; i += 8)
+            {
+                // Reverse the current set of 8 bits
+                for (int j = 0; j < 8; j++)
+                {
+                    destination[destinationOffset + i + j] = source[sourceOffset + i + (7 - j)];
+                }
+            }
+
+            return destinationOffset + count;
+        }
+
+    }
+}

QRCoder/QRCodeGenerator.CodewordBlock.cs

@@ -1,4 +1,6 @@
-namespace QRCoder
+using System.Collections;
+
+namespace QRCoder
 {
     public partial class QRCodeGenerator
     {
@@ -13,16 +15,31 @@ private struct CodewordBlock
             /// </summary>
             /// <param name="codeWords">The array of data codewords for this block. Data codewords carry the actual information.</param>
             /// <param name="eccWords">The array of error correction codewords for this block. These codewords help recover the data if the QR code is damaged.</param>
-            public CodewordBlock(byte[] codeWords, byte[] eccWords)
+            public CodewordBlock(/* byte[] codeWordsArray, */ BitArray codeWords, int codeWordsOffset, int codeWordsLength, byte[] eccWords)
             {
+                //this.CodeWordsArray = codeWordsArray;
                 this.CodeWords = codeWords;
+                this.CodeWordsOffset = codeWordsOffset;
+                this.CodeWordsLength = codeWordsLength;
                 this.ECCWords = eccWords;
             }
 
+            //public byte[] CodeWordsArray { get; }
+
             /// <summary>
             /// Gets the data codewords associated with this block. 
             /// </summary>
-            public byte[] CodeWords { get; }
+            public BitArray CodeWords { get; }
+
+            /// <summary>
+            /// Gets the offset of the data codewords in the BitArray.
+            /// </summary>
+            public int CodeWordsOffset { get; }
+
+            /// <summary>
+            /// Gets the length of the data codewords in the BitArray.
+            /// </summary>
+            public int CodeWordsLength { get; }
 
             /// <summary>
             /// Gets the error correction codewords associated with this block.

QRCoder/QRCodeGenerator.cs

@@ -234,7 +234,7 @@ private static QRCodeData GenerateQrCode(BitArray bitArray, ECCLevel eccLevel, i
             for (var i = 0; i < Math.Max(eccInfo.CodewordsInGroup1, eccInfo.CodewordsInGroup2); i++)
             {
                 foreach (var codeBlock in codeWordWithECC)
-                    if (codeBlock.CodeWords.Length > i)
+                    if (codeBlock.CodeWordsLength / 8 > i)
                         interleavedLength += 8;
             }
             for (var i = 0; i < eccInfo.ECCPerBlock; i++)
@@ -251,8 +251,10 @@ private static QRCodeData GenerateQrCode(BitArray bitArray, ECCLevel eccLevel, i
             for (var i = 0; i < Math.Max(eccInfo.CodewordsInGroup1, eccInfo.CodewordsInGroup2); i++)
             {
                 foreach (var codeBlock in codeWordWithECC)
-                    if (codeBlock.CodeWords.Length > i)
-                        pos = DecToBin(codeBlock.CodeWords[i], 8, interleavedData, pos);
+                {
+                    if (codeBlock.CodeWordsLength / 8 > i)
+                        pos = codeBlock.CodeWords.CopyTo(i * 8 + codeBlock.CodeWordsOffset, interleavedData, pos, 8);
+                }
             }
             for (var i = 0; i < eccInfo.ECCPerBlock; i++)
             {
@@ -290,10 +292,13 @@ void AddCodeWordBlocks(int blockNum, int blocksInGroup, int codewordsInGroup, Bi
                 var groupLength = codewordsInGroup * 8;
                 for (var i = 0; i < blocksInGroup; i++)
                 {
-                    var bitBlockList = BinaryStringToBitBlockByteList(bitArray2, offset2, groupLength);
+                    //var bitBlockList = BinaryStringToBitBlockByteList(bitArray2, offset2, groupLength);
                     var eccWordList = CalculateECCWords(bitArray2, offset2, groupLength, eccInfo);
                     codeWordWithECC.Add(new CodewordBlock(
-                                          bitBlockList,
+                                          //bitBlockList,
+                                          bitArray2,
+                                          offset2,
+                                          groupLength,
                                           eccWordList)
                                     );
                     offset2 += groupLength;