Skip to content

Commit 97d1ce5

Browse files
committed
Updates based on code review
1 parent 069e4a1 commit 97d1ce5

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

QRCoder/PayloadGenerator.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2516,8 +2516,8 @@ public override string ToString()
25162516
var cp = characterSet.ToString().Replace("_", "-");
25172517
var bytes = ToBytes();
25182518

2519-
#if NETCOREAPP
2520-
System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
2519+
#if !NETFRAMEWORK
2520+
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
25212521
#endif
25222522
return Encoding.GetEncoding(cp).GetString(bytes, 0, bytes.Length);
25232523
}
@@ -2532,7 +2532,7 @@ public byte[] ToBytes()
25322532
{
25332533
//Setup byte encoder
25342534
//Encode return string as byte[] with correct CharacterSet
2535-
#if !NETFRAMEWORK // -- why different ifdef than line 2519? --
2535+
#if !NETFRAMEWORK
25362536
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
25372537
#endif
25382538
var cp = this.characterSet.ToString().Replace("_", "-");
@@ -3111,7 +3111,7 @@ private static string ConvertStringToEncoding(string message, string encoding)
31113111
Encoding utf8 = Encoding.UTF8;
31123112
byte[] utfBytes = utf8.GetBytes(message);
31133113
byte[] isoBytes = Encoding.Convert(utf8, iso, utfBytes);
3114-
return iso.GetString(isoBytes, 0, isoBytes.Length);
3114+
return iso.GetString(isoBytes);
31153115
}
31163116

31173117
private static string EscapeInput(string inp, bool simple = false)

QRCoder/QRCodeGenerator.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,8 +1026,7 @@ private static bool IsUtf8(EncodingMode encoding, string plainText, bool forceUt
10261026
private static bool IsValidISO(string input)
10271027
{
10281028
var bytes = Encoding.GetEncoding("ISO-8859-1").GetBytes(input);
1029-
//var result = Encoding.GetEncoding("ISO-8859-1").GetString(bytes);
1030-
var result = Encoding.GetEncoding("ISO-8859-1").GetString(bytes,0,bytes.Length);
1029+
var result = Encoding.GetEncoding("ISO-8859-1").GetString(bytes);
10311030
return String.Equals(input, result);
10321031
}
10331032

0 commit comments

Comments
 (0)