From b08e24c49fb26d353c1a8b31ad8674952d79a0da Mon Sep 17 00:00:00 2001 From: Licshee Date: Thu, 4 Feb 2016 12:51:27 +0800 Subject: [PATCH] equality operators are always prefered in C# since the default object.Equals(object) does nothing more than object.ReferenceEquals(object) --- .../3rd/zxing/common/reedsolomon/GenericGFPoly.cs | 6 +++--- shadowsocks-csharp/3rd/zxing/qrcode/encoder/Encoder.cs | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/shadowsocks-csharp/3rd/zxing/common/reedsolomon/GenericGFPoly.cs b/shadowsocks-csharp/3rd/zxing/common/reedsolomon/GenericGFPoly.cs index 427fe11..96df3e6 100755 --- a/shadowsocks-csharp/3rd/zxing/common/reedsolomon/GenericGFPoly.cs +++ b/shadowsocks-csharp/3rd/zxing/common/reedsolomon/GenericGFPoly.cs @@ -145,7 +145,7 @@ namespace ZXing.Common.ReedSolomon internal GenericGFPoly addOrSubtract(GenericGFPoly other) { - if (!field.Equals(other.field)) + if (field != other.field) { throw new ArgumentException("GenericGFPolys do not have same GenericGF field"); } @@ -181,7 +181,7 @@ namespace ZXing.Common.ReedSolomon internal GenericGFPoly multiply(GenericGFPoly other) { - if (!field.Equals(other.field)) + if (field != other.field) { throw new ArgumentException("GenericGFPolys do not have same GenericGF field"); } @@ -246,7 +246,7 @@ namespace ZXing.Common.ReedSolomon internal GenericGFPoly[] divide(GenericGFPoly other) { - if (!field.Equals(other.field)) + if (field != other.field) { throw new ArgumentException("GenericGFPolys do not have same GenericGF field"); } diff --git a/shadowsocks-csharp/3rd/zxing/qrcode/encoder/Encoder.cs b/shadowsocks-csharp/3rd/zxing/qrcode/encoder/Encoder.cs index 56c9a9a..0af5537 100755 --- a/shadowsocks-csharp/3rd/zxing/qrcode/encoder/Encoder.cs +++ b/shadowsocks-csharp/3rd/zxing/qrcode/encoder/Encoder.cs @@ -514,7 +514,8 @@ namespace ZXing.QrCode.Internal BitArray bits, String encoding) { - if (mode.Equals(Mode.BYTE)) + // TODO: check the purpose of this .Equals(obj) + if (mode == Mode.BYTE) append8BitBytes(content, bits, encoding); else throw new WriterException("Invalid mode: " + mode);