Merge branch 'optimize_compression' of https://github.com/Shane32/QRCoder into optimize_compression

Author: Shane32

QRCoder/QRCodeData.cs

@@ -81,20 +81,30 @@ public QRCodeData(byte[] rawData, Compression compressMode)
             rawData = output.ToArray();
         }
 
-        var count = rawData.Length;
-
-        if (count < 5)
+        if (rawData.Length < 5)
             throw new Exception("Invalid raw data file. File too short.");
         if (rawData[0] != 0x51 || rawData[1] != 0x52 || rawData[2] != 0x52)
             throw new Exception("Invalid raw data file. Filetype doesn't match \"QRR\".");
 
-        //Set QR code version
+        // Set QR code version from side length (includes 8-module quiet zone)
         var sideLen = (int)rawData[4];
-        Version = (sideLen - 21 - 8) / 4 + 1;
+        if (sideLen < 29) // Micro QR: sideLen = 19 + 2*(m-1), m in [1..4] -> versions -1..-4
+        {
+            if (((sideLen - 19) & 1) != 0)
+                throw new Exception("Invalid raw data file. Side length not valid for Micro QR.");
+            var m = ((sideLen - 19) / 2) + 1;
+            Version = -m;
+        }
+        else // Standard QR: sideLen = 29 + 4*(v-1), v in [1..40]
+        {
+            if (((sideLen - 29) % 4) != 0)
+                throw new Exception("Invalid raw data file. Side length not valid for QR.");
+            Version = ((sideLen - 29) / 4) + 1;
+        }
 
         //Unpack
-        var modules = new Queue<bool>(8 * (count - 5));
-        for (int j = 5; j < count; j++)
+        var modules = new Queue<bool>(8 * (rawData.Length - 5));
+        for (int j = 5; j < rawData.Length; j++)
         {
             var b = rawData[j];
             for (int i = 7; i >= 0; i--)
@@ -160,7 +170,8 @@ public byte[] GetRawData(Compression compressMode)
                     dataQueue.Enqueue((bool)module ? 1 : 0);
                 }
             }
-            for (int i = 0; i < 8 - (ModuleMatrix.Count * ModuleMatrix.Count) % 8; i++)
+            int mod = (int)(((uint)ModuleMatrix.Count * (uint)ModuleMatrix.Count) % 8);
+            for (int i = 0; i < 8 - mod; i++)
             {
                 dataQueue.Enqueue(0);
             }

QRCoderTests/QRGeneratorTests.cs

@@ -623,16 +623,35 @@ public SamplePayload(string data, QRCodeGenerator.ECCLevel eccLevel)
         public override string ToString() => _data;
     }
 
-#if !NETFRAMEWORK // [Theory] is not supported in xunit < 2.0.0
     [Theory]
     [InlineData(QRCodeData.Compression.Uncompressed)]
     [InlineData(QRCodeData.Compression.Deflate)]
     [InlineData(QRCodeData.Compression.GZip)]
     public void can_save_and_load_qrcode_data(QRCodeData.Compression compressionMode)
     {
         // Arrange - Create a QR code
-        var gen = new QRCodeGenerator();
-        var originalQrData = gen.CreateQrCode("https://github.com/Shane32/QRCoder", ECCLevel.H);
+        var originalQrData = QRCodeGenerator.GenerateQrCode("https://github.com/Shane32/QRCoder", ECCLevel.H);
+        var originalMatrix = string.Join("", originalQrData.ModuleMatrix.Select(x => x.ToBitString()).ToArray());
+
+        // Act - Get raw data and reload it
+        var rawData = originalQrData.GetRawData(compressionMode);
+        var reloadedQrData = new QRCodeData(rawData, compressionMode);
+        var reloadedMatrix = string.Join("", reloadedQrData.ModuleMatrix.Select(x => x.ToBitString()).ToArray());
+
+        // Assert - Verify the data matches
+        reloadedQrData.Version.ShouldBe(originalQrData.Version);
+        reloadedQrData.ModuleMatrix.Count.ShouldBe(originalQrData.ModuleMatrix.Count);
+        reloadedMatrix.ShouldBe(originalMatrix);
+    }
+
+    [Theory]
+    [InlineData(QRCodeData.Compression.Uncompressed)]
+    [InlineData(QRCodeData.Compression.Deflate)]
+    [InlineData(QRCodeData.Compression.GZip)]
+    public void can_save_and_load_micro_qrcode_data(QRCodeData.Compression compressionMode)
+    {
+        // Arrange - Create a QR code
+        var originalQrData = QRCodeGenerator.GenerateMicroQrCode("abcd");
         var originalMatrix = string.Join("", originalQrData.ModuleMatrix.Select(x => x.ToBitString()).ToArray());
 
         // Act - Get raw data and reload it
@@ -645,7 +664,6 @@ public void can_save_and_load_qrcode_data(QRCodeData.Compression compressionMode
         reloadedQrData.ModuleMatrix.Count.ShouldBe(originalQrData.ModuleMatrix.Count);
         reloadedMatrix.ShouldBe(originalMatrix);
     }
-#endif
 }
 
 public static class ExtensionMethods