Browse Source

fix case-insensitive string comparison

tags/3.0
Licshee 8 years ago
parent
commit
6c28613c7e
3 changed files with 11 additions and 10 deletions
  1. +8
    -8
      shadowsocks-csharp/3rd/zxing/common/StringUtils.cs
  2. +2
    -2
      shadowsocks-csharp/FodyWeavers.xml
  3. +1
    -0
      shadowsocks-csharp/packages.config

+ 8
- 8
shadowsocks-csharp/3rd/zxing/common/StringUtils.cs View File

@@ -30,16 +30,16 @@ namespace ZXing.Common
#if (WINDOWS_PHONE70 || WINDOWS_PHONE71 || WINDOWS_PHONE80 || SILVERLIGHT4 || SILVERLIGHT5 || NETFX_CORE || PORTABLE)
private const String PLATFORM_DEFAULT_ENCODING = "UTF-8";
#else
private static String PLATFORM_DEFAULT_ENCODING = Encoding.Default.WebName;
private static string PLATFORM_DEFAULT_ENCODING = Encoding.Default.WebName;
#endif
public static String SHIFT_JIS = "SJIS";
public static String GB2312 = "GB2312";
private const String EUC_JP = "EUC-JP";
private const String UTF8 = "UTF-8";
private const String ISO88591 = "ISO-8859-1";
public static string SHIFT_JIS = "SJIS";
public static string GB2312 = "GB2312";
private const string EUC_JP = "EUC-JP";
private const string UTF8 = "UTF-8";
private const string ISO88591 = "ISO-8859-1";
private static readonly bool ASSUME_SHIFT_JIS =
String.Compare(SHIFT_JIS, PLATFORM_DEFAULT_ENCODING, StringComparison.OrdinalIgnoreCase) == 0 ||
String.Compare(EUC_JP, PLATFORM_DEFAULT_ENCODING, StringComparison.OrdinalIgnoreCase) == 0;
string.Equals(SHIFT_JIS, PLATFORM_DEFAULT_ENCODING, StringComparison.OrdinalIgnoreCase) ||
string.Equals(EUC_JP, PLATFORM_DEFAULT_ENCODING, StringComparison.OrdinalIgnoreCase);
/// <summary>
/// Guesses the encoding.


+ 2
- 2
shadowsocks-csharp/FodyWeavers.xml View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<Costura/>
<Costura />
<Caseless />
</Weavers>

+ 1
- 0
shadowsocks-csharp/packages.config View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Caseless.Fody" version="1.3.7" targetFramework="net40-client" developmentDependency="true" />
<package id="Costura.Fody" version="1.3.3.0" targetFramework="net4-client" developmentDependency="true" />
<package id="Fody" version="1.29.4" targetFramework="net40-client" developmentDependency="true" />
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net40-client" />


Loading…
Cancel
Save