Merge branch 'master' into support_base64_linux

Author: Shane32

QRCoder/ASCIIQRCode.cs

@@ -16,25 +16,29 @@ public AsciiQRCode(QRCodeData data) : base(data) { }
 
 
         /// <summary>
-        /// Returns a strings that contains the resulting QR code as ASCII chars.
+        /// Returns a strings that contains the resulting QR code as textual representation.
         /// </summary>
         /// <param name="repeatPerModule">Number of repeated darkColorString/whiteSpaceString per module.</param>
         /// <param name="darkColorString">String for use as dark color modules. In case of string make sure whiteSpaceString has the same length.</param>
         /// <param name="whiteSpaceString">String for use as white modules (whitespace). In case of string make sure darkColorString has the same length.</param>
+        /// <param name="drawQuietZones">Bool that defines if quiet zones around the QR code shall be drawn</param>
         /// <param name="endOfLine">End of line separator. (Default: \n)</param>
         /// <returns></returns>
         public string GetGraphic(int repeatPerModule, string darkColorString = "██", string whiteSpaceString = "  ", bool drawQuietZones = true, string endOfLine = "\n")
         {
+            if (repeatPerModule < 1)
+                throw new Exception("The repeatPerModule-parameter must be 1 or greater.");
             return string.Join(endOfLine, GetLineByLineGraphic(repeatPerModule, darkColorString, whiteSpaceString, drawQuietZones));
         }
-        
+
 
         /// <summary>
         /// Returns an array of strings that contains each line of the resulting QR code as ASCII chars.
         /// </summary>
         /// <param name="repeatPerModule">Number of repeated darkColorString/whiteSpaceString per module.</param>
         /// <param name="darkColorString">String for use as dark color modules. In case of string make sure whiteSpaceString has the same length.</param>
         /// <param name="whiteSpaceString">String for use as white modules (whitespace). In case of string make sure darkColorString has the same length.</param>
+        /// <param name="drawQuietZones">Bool that defines if quiet zones around the QR code shall be drawn</param>
         /// <returns></returns>
         public string[] GetLineByLineGraphic(int repeatPerModule, string darkColorString = "██", string whiteSpaceString = "  ", bool drawQuietZones = true)
         {
@@ -62,6 +66,61 @@ public string[] GetLineByLineGraphic(int repeatPerModule, string darkColorString
             }
             return qrCode.ToArray();
         }
+
+        /// <summary>
+        /// Returns a strings that contains the resulting QR code as minified textual representation.
+        /// </summary>
+        /// <param name="drawQuietZones">Bool that defines if quiet zones around the QR code shall be drawn</param>
+        /// <param name="invert">If set to true, dark and light colors will be inverted</param>
+        /// <param name="endOfLine">End of line separator. (Default: \n)</param>
+        /// <returns></returns>
+        public string GetGraphicSmall(bool drawQuietZones = true, bool invert = false, string endOfLine = "\n")
+        {
+            bool BLACK = true, WHITE = false;
+
+            var palette = new
+            {
+                WHITE_ALL = "\u2588",
+                WHITE_BLACK = "\u2580",
+                BLACK_WHITE = "\u2584",
+                BLACK_ALL = " ",
+            };
+
+            var moduleData = QrCodeData.ModuleMatrix;
+            var sbSize = (moduleData.Count + endOfLine.Length) * (int)Math.Ceiling(moduleData.Count / 2.0) - 1;
+            var lineBuilder = new StringBuilder(sbSize);
+
+            var quietZonesModifier = (drawQuietZones ? 0 : 8);
+            var quietZonesOffset = (int)(quietZonesModifier * 0.5);
+            var sideLength = (moduleData.Count - quietZonesModifier);
+
+            for (var row = 0; row < sideLength; row += 2)
+            {
+                for (var col = 0; col < sideLength; col++)
+                {
+                    var current = moduleData[col + quietZonesOffset][row + quietZonesOffset] ^ invert;
+                    var nextRowId = row + quietZonesOffset + 1;
+
+                    // Set next to whitespace "color"
+                    var next = BLACK;
+                    // Fill next with value, if in data range
+                    if (nextRowId < QrCodeData.ModuleMatrix.Count)
+                        next = moduleData[col + quietZonesOffset][nextRowId] ^ invert;
+                        
+                    if (current == WHITE && next == WHITE)
+                        lineBuilder.Append(palette.WHITE_ALL);
+                    else if (current == WHITE && next == BLACK)
+                        lineBuilder.Append(palette.WHITE_BLACK);
+                    else if (current == BLACK && next == WHITE)
+                        lineBuilder.Append(palette.BLACK_WHITE);
+                    else
+                        lineBuilder.Append(palette.BLACK_ALL);
+                }
+                if (row + 2 < sideLength)
+                    lineBuilder.Append(endOfLine);
+            }
+            return lineBuilder.ToString();
+        }
     }
 
 
@@ -74,5 +133,13 @@ public static string GetQRCode(string plainText, int pixelsPerModule, string dar
             using (var qrCode = new AsciiQRCode(qrCodeData))
                 return qrCode.GetGraphic(pixelsPerModule, darkColorString, whiteSpaceString, drawQuietZones, endOfLine);
         }
+
+        public static string GetQRCode(string plainText, ECCLevel eccLevel, bool forceUtf8 = false, bool utf8BOM = false, EciMode eciMode = EciMode.Default, int requestedVersion = -1, string endOfLine = "\n", bool drawQuietZones = true, bool invert = true)
+        {
+            using (var qrGenerator = new QRCodeGenerator())
+            using (var qrCodeData = qrGenerator.CreateQrCode(plainText, eccLevel, forceUtf8, utf8BOM, eciMode, requestedVersion))
+            using (var qrCode = new AsciiQRCode(qrCodeData))
+                return qrCode.GetGraphicSmall(drawQuietZones, invert, endOfLine);
+        }
     }
 }

QRCoder/ArtQRCode.cs

@@ -120,9 +120,10 @@ public Bitmap GetGraphic(int pixelsPerModule, Color darkColor, Color lightColor,
                         if (finderPatternImage != null)
                         {
                             var finderPatternSize = 7 * pixelsPerModule;
-                            graphics.DrawImage(finderPatternImage, new Rectangle(0, 0, finderPatternSize, finderPatternSize));
-                            graphics.DrawImage(finderPatternImage, new Rectangle(size - finderPatternSize, 0, finderPatternSize, finderPatternSize));
-                            graphics.DrawImage(finderPatternImage, new Rectangle(0, size - finderPatternSize, finderPatternSize, finderPatternSize));
+                            var finderPatternOffset = drawQuietZones ? 4 * pixelsPerModule : 0;
+                            graphics.DrawImage(finderPatternImage, new Rectangle(finderPatternOffset, finderPatternOffset, finderPatternSize, finderPatternSize));
+                            graphics.DrawImage(finderPatternImage, new Rectangle(size - finderPatternOffset - finderPatternSize, finderPatternOffset, finderPatternSize, finderPatternSize));
+                            graphics.DrawImage(finderPatternImage, new Rectangle(finderPatternOffset, size - finderPatternOffset - finderPatternSize, finderPatternSize, finderPatternSize));
                         }
                         graphics.Save();
                     }

QRCoder/PayloadGenerator.cs

@@ -987,7 +987,7 @@ public static Contact WithCombinedAddress(string name, string country, string ad
                 private Contact(string name, string zipCode, string city, string country, string streetOrAddressline1, string houseNumberOrAddressline2, AddressType addressType)
                 {
                     //Pattern extracted from https://qr-validation.iso-payments.ch as explained in https://github.com/codebude/QRCoder/issues/97
-                    var charsetPattern = @"^([a-zA-Z0-9\.,;:'\ \+\-/\(\)?\*\[\]\{\}\\`´~ ]|[!""#%&<>÷=@_$£]|[àáâäçèéêëìíîïñòóôöùúûüýßÀÁÂÄÇÈÉÊËÌÍÎÏÒÓÔÖÙÚÛÜÑ])*$";
+                    var charsetPattern = @"^([a-zA-Z0-9\.,;:'\ \+\-/\(\)?\*\[\]\{\}\\`´~ ^|]|[!""#%&<>÷=@_$£¡¢¤¥¦§¨©ª«¬®¯°±²³µ¶·¸¹º»¼½¾¿×Ø€]|[àáâäãåāăąçćĉċčďđèéêëēĕėęěĝğġģĥħìíîïĩīĭįıijķĸĺļľŀłñńņňʼnŋòóôöōŏőõŕŗřśŝşšșţťŧțùúûüũūŭůűųŵýÿŷźżžßÀÁÂÄÃÅĀĂĄÇĆĈĊČĎĐÈÉÊËĒĔĖĘĚĜĞĠĢĤĦÌÍÎÏĨĪĬĮİIJĴĵĶĹĻĽĿŁÑŃŅŇŊÒÓÔÖÕŌŎŐŔŖŘŚŜŞŠȘŢŤŦȚÙÚÛÜŨŪŬŮŰŲŴÝŶŸŹŻŽÆÐÞæðøþŒœſ])*$";
 
                     this.adrType = addressType;
 
@@ -1051,7 +1051,7 @@ private Contact(string name, string zipCode, string city, string country, string
                     }
 
                     if (!IsValidTwoLetterCode(country))
-                        throw new SwissQrCodeContactException("Country must be a valid \"two letter\" country code as defined by  ISO 3166-1, but it isn't.");
+                        throw new SwissQrCodeContactException("Country must be a valid \"two letter\" country code as defined by ISO 3166-1, but it isn't.");
 
                     this.country = country;
                 }
@@ -1060,7 +1060,7 @@ private Contact(string name, string zipCode, string city, string country, string
 
                 private static HashSet<string> ValidTwoLetterCodes()
                 {
-                    string[] codes = new string[]{ "AF", "AL", "DZ", "AS", "AD", "AO", "AI", "AQ", "AG", "AR", "AM", "AW", "AU", "AT", "AZ", "BS", "BH", "BD", "BB", "BY", "BE", "BZ", "BJ", "BM", "BT", "BO", "BQ", "BA", "BW", "BV", "BR", "IO", "BN", "BG", "BF", "BI", "CV", "KH", "CM", "CA", "KY", "CF", "TD", "CL", "CN", "CX", "CC", "CO", "KM", "CG", "CD", "CK", "CR", "CI", "HR", "CU", "CW", "CY", "CZ", "DK", "DJ", "DM", "DO", "EC", "EG", "SV", "GQ", "ER", "EE", "SZ", "ET", "FK", "FO", "FJ", "FI", "FR", "GF", "PF", "TF", "GA", "GM", "GE", "DE", "GH", "GI", "GR", "GL", "GD", "GP", "GU", "GT", "GG", "GN", "GW", "GY", "HT", "HM", "VA", "HN", "HK", "HU", "IS", "IN", "ID", "IR", "IQ", "IE", "IM", "IL", "IT", "JM", "JP", "JE", "JO", "KZ", "KE", "KI", "KP", "KR", "KW", "KG", "LA", "LV", "LB", "LS", "LR", "LY", "LI", "LT", "LU", "MO", "MG", "MW", "MY", "MV", "ML", "MT", "MH", "MQ", "MR", "MU", "YT", "MX", "FM", "MD", "MC", "MN", "ME", "MS", "MA", "MZ", "MM", "NA", "NR", "NP", "NL", "NC", "NZ", "NI", "NE", "NG", "NU", "NF", "MP", "MK", "NO", "OM", "PK", "PW", "PS", "PA", "PG", "PY", "PE", "PH", "PN", "PL", "PT", "PR", "QA", "RE", "RO", "RU", "RW", "BL", "SH", "KN", "LC", "MF", "PM", "VC", "WS", "SM", "ST", "SA", "SN", "RS", "SC", "SL", "SG", "SX", "SK", "SI", "SB", "SO", "ZA", "GS", "SS", "ES", "LK", "SD", "SR", "SJ", "SE", "CH", "SY", "TW", "TJ", "TZ", "TH", "TL", "TG", "TK", "TO", "TT", "TN", "TR", "TM", "TC", "TV", "UG", "UA", "AE", "GB", "US", "UM", "UY", "UZ", "VU", "VE", "VN", "VG", "VI", "WF", "EH", "YE", "ZM", "ZW", "AX" };
+                    string[] codes = new string[]{ "AF", "AL", "DZ", "AS", "AD", "AO", "AI", "AQ", "AG", "AR", "AM", "AW", "AU", "AT", "AZ", "BS", "BH", "BD", "BB", "BY", "BE", "BZ", "BJ", "BM", "BT", "BO", "BQ", "BA", "BW", "BV", "BR", "IO", "BN", "BG", "BF", "BI", "CV", "KH", "CM", "CA", "KY", "CF", "TD", "CL", "CN", "CX", "CC", "CO", "KM", "CG", "CD", "CK", "CR", "CI", "HR", "CU", "CW", "CY", "CZ", "DK", "DJ", "DM", "DO", "EC", "EG", "SV", "GQ", "ER", "EE", "SZ", "ET", "FK", "FO", "FJ", "FI", "FR", "GF", "PF", "TF", "GA", "GM", "GE", "DE", "GH", "GI", "GR", "GL", "GD", "GP", "GU", "GT", "GG", "GN", "GW", "GY", "HT", "HM", "VA", "HN", "HK", "HU", "IS", "IN", "ID", "IR", "IQ", "IE", "IM", "IL", "IT", "JM", "JP", "JE", "JO", "KZ", "KE", "KI", "KP", "KR", "KW", "KG", "LA", "LV", "LB", "LS", "LR", "LY", "LI", "LT", "LU", "MO", "MG", "MW", "MY", "MV", "ML", "MT", "MH", "MQ", "MR", "MU", "YT", "MX", "FM", "MD", "MC", "MN", "ME", "MS", "MA", "MZ", "MM", "NA", "NR", "NP", "NL", "NC", "NZ", "NI", "NE", "NG", "NU", "NF", "MP", "MK", "NO", "OM", "PK", "PW", "PS", "PA", "PG", "PY", "PE", "PH", "PN", "PL", "PT", "PR", "QA", "RE", "RO", "RU", "RW", "BL", "SH", "KN", "LC", "MF", "PM", "VC", "WS", "SM", "ST", "SA", "SN", "RS", "SC", "SL", "SG", "SX", "SK", "SI", "SB", "SO", "ZA", "GS", "SS", "ES", "LK", "SD", "SR", "SJ", "SE", "CH", "SY", "TW", "TJ", "TZ", "TH", "TL", "TG", "TK", "TO", "TT", "TN", "TR", "TM", "TC", "TV", "UG", "UA", "AE", "GB", "US", "UM", "UY", "UZ", "VU", "VE", "VN", "VG", "VI", "WF", "EH", "YE", "ZM", "ZW", "AX", "XK" };
                     return new HashSet<string>(codes, StringComparer.OrdinalIgnoreCase);
                 }
 
@@ -1140,7 +1140,8 @@ public override string ToString()
                 //AddInf "logical" element
                 SwissQrCodePayload += (!string.IsNullOrEmpty(additionalInformation.UnstructureMessage) ? additionalInformation.UnstructureMessage : string.Empty) + br; //Ustrd
                 SwissQrCodePayload += additionalInformation.Trailer + br; //Trailer
-                SwissQrCodePayload += (!string.IsNullOrEmpty(additionalInformation.BillInformation) ? additionalInformation.BillInformation : string.Empty) + br; //StrdBkgInf
+                // Bugfix PR #399 If BillInformation is empty, insert no linebreak
+                SwissQrCodePayload += (!string.IsNullOrEmpty(additionalInformation.BillInformation) ? additionalInformation.BillInformation + br : string.Empty); //StrdBkgInf
 
                 //AltPmtInf "logical" element
                 if (!string.IsNullOrEmpty(alternativeProcedure1))

QRCoder/QRCodeGenerator.cs

@@ -150,9 +150,7 @@ public static QRCodeData GenerateQrCode(string plainText, ECCLevel eccLevel, boo
             }
             modeIndicator += DecToBin((int)encoding, 4);
             var countIndicator = DecToBin(dataInputLength, GetCountIndicatorLength(version, encoding));
-            var bitString = modeIndicator + countIndicator;
-
-            bitString += codedText;
+            var bitString = modeIndicator + countIndicator + codedText;
 
             return GenerateQrCode(bitString, eccLevel, version);
         }
@@ -170,13 +168,18 @@ public static QRCodeData GenerateQrCode(byte[] binaryData, ECCLevel eccLevel)
             int version = GetVersion(binaryData.Length, EncodingMode.Byte, eccLevel);
 
             string modeIndicator = DecToBin((int)EncodingMode.Byte, 4);
-            string countIndicator = DecToBin(binaryData.Length, GetCountIndicatorLength(version, EncodingMode.Byte));
+            int countIndicatorLen = GetCountIndicatorLength(version, EncodingMode.Byte);
+            string countIndicator = DecToBin(binaryData.Length, countIndicatorLen);
 
-            string bitString = modeIndicator + countIndicator;
+            StringBuilder sb = new StringBuilder(capacity: 4 + countIndicatorLen + (binaryData.Length*8));
+            sb.Append(modeIndicator).Append(countIndicator);
             foreach (byte b in binaryData)
             {
-                bitString += DecToBin(b, 8);
+                sb.Append(DecToBin(b, 8));
+
             }
+            string bitString = sb.ToString();
+
 
             return GenerateQrCode(bitString, eccLevel, version);
         }

QRCoderTests/ArtQRCodeRendererTests.cs

@@ -32,11 +32,15 @@ public void can_create_standard_qrcode_graphic_with_custom_finder()
         {
             var gen = new QRCodeGenerator();
             var data = gen.CreateQrCode("This is a quick test! 123#?", QRCodeGenerator.ECCLevel.H);
-            var finder = new Bitmap(15, 15);
+            var finder = new Bitmap(70, 70);
+            using (var g = Graphics.FromImage(finder))
+            {
+                g.FillRectangle(Brushes.Red, 0, 0, 70, 70);
+            }
             var bmp = new ArtQRCode(data).GetGraphic(10, Color.Black, Color.White, Color.Transparent, finderPatternImage: finder);
 
             var result = HelperFunctions.BitmapToHash(bmp);
-            result.ShouldBe("1102c0c6f235eaf4c3ac639f82f17bfa");
+            result.ShouldBe("5df3f2892eeb01e9c282ad10f642dec2");
         }
 
         [Fact]