diff --git a/CHANGES b/CHANGES index 444638d9..de4f3199 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +2.1.5 2014-12-25 +- Fix QR Code compatibility with iOS +- Only left button will trigger double click on tray icon + 2.1.4 2014-12-20 - Fix crash when remarks are too long diff --git a/packaging/upload.sh b/packaging/upload.sh new file mode 100755 index 00000000..82f48b06 --- /dev/null +++ b/packaging/upload.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +version=$1 + +rsync --progress -e ssh shadowsocks-csharp/bin/x86/Release/Shadowsocks-win-dotnet4.0-$1.zip frs.sourceforge.net:/home/frs/project/shadowsocksgui/dist/ +rsync --progress -e ssh shadowsocks-csharp/bin/x86/Release/Shadowsocks-win-$1.zip frs.sourceforge.net:/home/frs/project/shadowsocksgui/dist/ diff --git a/shadowsocks-csharp/3rd/QRCodeCS.cs b/shadowsocks-csharp/3rd/QRCodeCS.cs deleted file mode 100644 index a380c978..00000000 --- a/shadowsocks-csharp/3rd/QRCodeCS.cs +++ /dev/null @@ -1,1209 +0,0 @@ -//--------------------------------------------------------------------- -// QRCode for C#4.0 Silverlight is translation of QRCode for JavaScript -// https://github.com/jeromeetienne/jquery-qrcode/ -// -// Copyright (c) 2009 Kazuhiko Arase -// -// URL: http://www.d-project.com/ -// -// Licensed under the MIT license: -// http://www.opensource.org/licenses/mit-license.php -// -// The word "QR Code" is registered trademark of -// DENSO WAVE INCORPORATED -// http://www.denso-wave.com/qrcode/faqpatent-e.html -// -//--------------------------------------------------------------------- -namespace QRCode4CS -{ - using System; - using System.Collections.Generic; - - - public class Error : Exception - { - public Error() { } - public Error(string message) : base(message) { } - public Error(string message, Exception inner) : base(message, inner) { } - } - - public enum QRMode : int - { - MODE_NUMBER = 1 << 0, - MODE_ALPHA_NUM = 1 << 1, - MODE_8BIT_BYTE = 1 << 2, - MODE_KANJI = 1 << 3 - } - - public enum QRErrorCorrectLevel : int - { - L = 1, - M = 0, - Q = 3, - H = 2 - } - - public enum QRMaskPattern : int - { - PATTERN000 = 0, - PATTERN001 = 1, - PATTERN010 = 2, - PATTERN011 = 3, - PATTERN100 = 4, - PATTERN101 = 5, - PATTERN110 = 6, - PATTERN111 = 7 - } - - public struct Options - { - public int Width { get; set; } - public int Height { get; set; } - public QRErrorCorrectLevel CorrectLevel { get; set; } - public int TypeNumber { get; set; } - public string Text { get; set; } - - public Options(string text) - : this() - { - Width = 256; - Height = 256; - TypeNumber = 4; - CorrectLevel = QRErrorCorrectLevel.H; - Text = text; - } - } - - internal static class QRUtil - { - internal const int G15 = (1 << 10) | (1 << 8) | (1 << 5) | (1 << 4) | (1 << 2) | (1 << 1) | (1 << 0); - internal const int G18 = (1 << 12) | (1 << 11) | (1 << 10) | (1 << 9) | (1 << 8) | (1 << 5) | (1 << 2) | (1 << 0); - internal const int G15_MASK = (1 << 14) | (1 << 12) | (1 << 10) | (1 << 4) | (1 << 1); - internal static readonly int[][] PATTERN_POSITION_TABLE = new int[][] { - new int[] {}, - new int [] {6, 18}, - new int [] {6, 22}, - new int [] {6, 26}, - new int [] {6, 30}, - new int [] {6, 34}, - new int [] {6, 22, 38}, - new int [] {6, 24, 42}, - new int [] {6, 26, 46}, - new int [] {6, 28, 50}, - new int [] {6, 30, 54}, - new int [] {6, 32, 58}, - new int [] {6, 34, 62}, - new int [] {6, 26, 46, 66}, - new int [] {6, 26, 48, 70}, - new int [] {6, 26, 50, 74}, - new int [] {6, 30, 54, 78}, - new int [] {6, 30, 56, 82}, - new int [] {6, 30, 58, 86}, - new int [] {6, 34, 62, 90}, - new int [] {6, 28, 50, 72, 94}, - new int [] {6, 26, 50, 74, 98}, - new int [] {6, 30, 54, 78, 102}, - new int [] {6, 28, 54, 80, 106}, - new int [] {6, 32, 58, 84, 110}, - new int [] {6, 30, 58, 86, 114}, - new int [] {6, 34, 62, 90, 118}, - new int [] {6, 26, 50, 74, 98, 122}, - new int [] {6, 30, 54, 78, 102, 126}, - new int [] {6, 26, 52, 78, 104, 130}, - new int [] {6, 30, 56, 82, 108, 134}, - new int [] {6, 34, 60, 86, 112, 138}, - - new int [] {6, 30, 58, 86, 114, 142}, - new int [] {6, 34, 62, 90, 118, 146}, - new int [] {6, 30, 54, 78, 102, 126, 150}, - new int [] {6, 24, 50, 76, 102, 128, 154}, - new int [] {6, 28, 54, 80, 106, 132, 158}, - new int [] {6, 32, 58, 84, 110, 136, 162}, - new int [] {6, 26, 54, 82, 110, 138, 166}, - new int [] {6, 30, 58, 86, 114, 142, 170} - }; - internal static int GetLengthInBits(QRMode mode, int type) - { - - if (1 <= type && type < 10) - { - - // 1 - 9 - - switch (mode) - { - case QRMode.MODE_NUMBER: return 10; - case QRMode.MODE_ALPHA_NUM: return 9; - case QRMode.MODE_8BIT_BYTE: return 8; - case QRMode.MODE_KANJI: return 8; - default: - throw new Error("mode:" + mode); - } - - } - else if (type < 27) - { - - // 10 - 26 - - switch (mode) - { - case QRMode.MODE_NUMBER: return 12; - case QRMode.MODE_ALPHA_NUM: return 11; - case QRMode.MODE_8BIT_BYTE: return 16; - case QRMode.MODE_KANJI: return 10; - default: - throw new Error("mode:" + mode); - } - - } - else if (type < 41) - { - - // 27 - 40 - - switch (mode) - { - case QRMode.MODE_NUMBER: return 14; - case QRMode.MODE_ALPHA_NUM: return 13; - case QRMode.MODE_8BIT_BYTE: return 16; - case QRMode.MODE_KANJI: return 12; - default: - throw new Error("mode:" + mode); - } - - } - else - { - throw new Error("type:" + type); - } - } - - internal static double GetLostPoint(QRCode qrCode) - { - int moduleCount = qrCode.GetModuleCount(); - double lostPoint = 0; - for (int row = 0; row < moduleCount; row++) - { - - for (int col = 0; col < moduleCount; col++) - { - - var sameCount = 0; - var dark = qrCode.IsDark(row, col); - - for (var r = -1; r <= 1; r++) - { - - if (row + r < 0 || moduleCount <= row + r) - { - continue; - } - - for (var c = -1; c <= 1; c++) - { - - if (col + c < 0 || moduleCount <= col + c) - { - continue; - } - - if (r == 0 && c == 0) - { - continue; - } - - if (dark == qrCode.IsDark((int)((int)row + r), (int)((int)col + c))) - { - sameCount++; - } - } - } - - if (sameCount > 5) - { - lostPoint += (int)(3 + sameCount - 5); - } - } - } - - // LEVEL2 - - for (int row = 0; row < moduleCount - 1; row++) - { - for (int col = 0; col < moduleCount - 1; col++) - { - var count = 0; - if (qrCode.IsDark(row, col)) count++; - if (qrCode.IsDark(row + 1, col)) count++; - if (qrCode.IsDark(row, col + 1)) count++; - if (qrCode.IsDark(row + 1, col + 1)) count++; - if (count == 0 || count == 4) - { - lostPoint += 3; - } - } - } - - // LEVEL3 - - for (int row = 0; row < moduleCount; row++) - { - for (int col = 0; col < moduleCount - 6; col++) - { - if (qrCode.IsDark(row, col) - && !qrCode.IsDark(row, col + 1) - && qrCode.IsDark(row, col + 2) - && qrCode.IsDark(row, col + 3) - && qrCode.IsDark(row, col + 4) - && !qrCode.IsDark(row, col + 5) - && qrCode.IsDark(row, col + 6)) - { - lostPoint += 40; - } - } - } - - for (int col = 0; col < moduleCount; col++) - { - for (int row = 0; row < moduleCount - 6; row++) - { - if (qrCode.IsDark(row, col) - && !qrCode.IsDark(row + 1, col) - && qrCode.IsDark(row + 2, col) - && qrCode.IsDark(row + 3, col) - && qrCode.IsDark(row + 4, col) - && !qrCode.IsDark(row + 5, col) - && qrCode.IsDark(row + 6, col)) - { - lostPoint += 40; - } - } - } - - // LEVEL4 - - int darkCount = 0; - - for (int col = 0; col < moduleCount; col++) - { - for (int row = 0; row < moduleCount; row++) - { - if (qrCode.IsDark(row, col)) - { - darkCount++; - } - } - } - - double ratio = Math.Abs(100.0 * darkCount / moduleCount / moduleCount - 50) / 5; - lostPoint += ratio * 10; - - return lostPoint; - - } - - - - - internal static int GetBCHTypeInfo(int data) - { - int d = (data << 10); - int s = 0; - while ((s = (int)(QRUtil.GetBCHDigit(d) - QRUtil.GetBCHDigit(QRUtil.G15))) >= 0) - { - d ^= (Convert.ToInt32(QRUtil.G15) << s); - } - return (int)((data << 10) | d) ^ QRUtil.G15_MASK; - } - - internal static int GetBCHTypeNumber(int data) - { - int d = data << 12; - while (QRUtil.GetBCHDigit(d) - QRUtil.GetBCHDigit(QRUtil.G18) >= 0) - { - d ^= (QRUtil.G18 << (QRUtil.GetBCHDigit(d) - QRUtil.GetBCHDigit(QRUtil.G18))); - } - return (data << 12) | d; - } - - internal static int GetBCHDigit(int dataInt) - { - - int digit = 0; - uint data = Convert.ToUInt32(dataInt); - while (data != 0) - { - digit++; - data >>= 1; - } - - return digit; - } - - internal static int[] GetPatternPosition(int typeNumber) - { - return QRUtil.PATTERN_POSITION_TABLE[typeNumber - 1]; - } - - internal static bool GetMask(QRMaskPattern maskPattern, int i, int j) - { - - switch (maskPattern) - { - - case QRMaskPattern.PATTERN000: return (i + j) % 2 == 0; - case QRMaskPattern.PATTERN001: return i % 2 == 0; - case QRMaskPattern.PATTERN010: return j % 3 == 0; - case QRMaskPattern.PATTERN011: return (i + j) % 3 == 0; - case QRMaskPattern.PATTERN100: return (Math.Floor((double) (i / 2)) + Math.Floor((double) (j / 3))) % 2 == 0; - case QRMaskPattern.PATTERN101: return (i * j) % 2 + (i * j) % 3 == 0; - case QRMaskPattern.PATTERN110: return ((i * j) % 2 + (i * j) % 3) % 2 == 0; - case QRMaskPattern.PATTERN111: return ((i * j) % 3 + (i + j) % 2) % 2 == 0; - - default: - throw new Error("bad maskPattern:" + maskPattern); - } - } - - - - internal static QRPolynomial GetErrorCorrectPolynomial(int errorCorrectLength) - { - QRPolynomial a = new QRPolynomial(new DataCache() { 1 }, 0); - - for (int i = 0; i < errorCorrectLength; i++) - { - a = a.Multiply(new QRPolynomial(new DataCache() { 1, QRMath.GExp(i) }, 0)); - } - - return a; - } - } - - internal struct QRPolynomial - { - private int[] m_num; - public QRPolynomial(DataCache num, int shift) - : this() - { - if (num == null) - { - throw new Error(); - } - - int offset = 0; - - while (offset < num.Count && num[offset] == 0) - { - offset++; - } - - this.m_num = new int[num.Count - offset + shift]; - for (int i = 0; i < num.Count - offset; i++) - { - this.m_num[i] = num[(int)(i + offset)]; - } - } - - public int Get(int index) - { - return this.m_num[(int)index]; - } - - public int GetLength() - { - return (int)this.m_num.Length; - } - - public QRPolynomial Multiply(QRPolynomial e) - { - - var num = new DataCache(this.GetLength() + e.GetLength() - 1); - - for (int i = 0; i < this.GetLength(); i++) - { - for (int j = 0; j < e.GetLength(); j++) - { - num[i + j] ^= QRMath.GExp(QRMath.GLog(this.Get(i)) + QRMath.GLog(e.Get(j))); - } - } - - return new QRPolynomial(num, 0); - } - - public QRPolynomial Mod(QRPolynomial e) - { - - if (Convert.ToInt64(this.GetLength()) - Convert.ToInt64(e.GetLength()) < 0) - { - return this; - } - - int ratio = QRMath.GLog(this.Get(0)) - QRMath.GLog(e.Get(0)); - - var num = new DataCache(this.GetLength()); - - for (int i = 0; i < this.GetLength(); i++) - { - num[i] = this.Get(i); - } - - for (int i = 0; i < e.GetLength(); i++) - { - num[i] ^= QRMath.GExp(QRMath.GLog(e.Get(i)) + ratio); - } - - // recursive call - return new QRPolynomial(num, 0).Mod(e); - } - } - - - internal static class QRMath - { - private static readonly int[] EXP_TABLE; - private static readonly int[] LOG_TABLE; - - static QRMath() - { - EXP_TABLE = new int[256]; - LOG_TABLE = new int[256]; - for (int i = 0; i < 8; i++) - { - QRMath.EXP_TABLE[i] = (int)(1 << (int)i); - } - for (int i = 8; i < 256; i++) - { - QRMath.EXP_TABLE[i] = QRMath.EXP_TABLE[i - 4] - ^ QRMath.EXP_TABLE[i - 5] - ^ QRMath.EXP_TABLE[i - 6] - ^ QRMath.EXP_TABLE[i - 8]; - } - for (int i = 0; i < 255; i++) - { - QRMath.LOG_TABLE[QRMath.EXP_TABLE[i]] = i; - } - } - - internal static int GLog(int n) - { - if (n < 1) - { - throw new Error("glog(" + n + ")"); - } - return QRMath.LOG_TABLE[n]; - } - - internal static int GExp(int n) - { - while (n < 0) - { - n += 255; - } - while (n >= 256) - { - n -= 255; - } - return QRMath.EXP_TABLE[n]; - } - } - - public struct QR8bitByte - { - public QRMode Mode { get; private set; } - private string m_data { get; set; } - - public QR8bitByte(string data) - : this() - { - m_data = data; - Mode = QRMode.MODE_8BIT_BYTE; - } - - public int Length - { - get - { - return m_data.Length; - } - } - - public void Write(QRBitBuffer buffer) - { - for (int i = 0; i < m_data.Length; ++i) - { - //item - buffer.Put(m_data[i], 8); - } - ///buffer = Data; - } - - - } - - internal class DataCache : List - { - public DataCache(int capacity) - : base() - { - for (int i = 0; i < capacity; i++) - { - base.Add(0); - } - } - - public DataCache() - : base() - { - - } - - - } - - internal struct QRRSBlock - { - private static readonly int[][] RS_BLOCK_TABLE = new int[][] { - // L - // M - // Q - // H - - // 1 - new int [] {1, 26, 19}, - new int [] {1, 26, 16}, - new int [] {1, 26, 13}, - new int [] {1, 26, 9}, - - // 2 - new int [] {1, 44, 34}, - new int [] {1, 44, 28}, - new int [] {1, 44, 22}, - new int [] {1, 44, 16}, - - // 3 - new int [] {1, 70, 55}, - new int [] {1, 70, 44}, - new int [] {2, 35, 17}, - new int [] {2, 35, 13}, - - // 4 - new int [] {1, 100, 80}, - new int [] {2, 50, 32}, - new int [] {2, 50, 24}, - new int [] {4, 25, 9}, - - // 5 - new int [] {1, 134, 108}, - new int [] {2, 67, 43}, - new int [] {2, 33, 15, 2, 34, 16}, - new int [] {2, 33, 11, 2, 34, 12}, - - // 6 - new int [] {2, 86, 68}, - new int [] {4, 43, 27}, - new int [] {4, 43, 19}, - new int [] {4, 43, 15}, - - // 7 - new int [] {2, 98, 78}, - new int [] {4, 49, 31}, - new int [] {2, 32, 14, 4, 33, 15}, - new int [] {4, 39, 13, 1, 40, 14}, - - // 8 - new int [] {2, 121, 97}, - new int [] {2, 60, 38, 2, 61, 39}, - new int [] {4, 40, 18, 2, 41, 19}, - new int [] {4, 40, 14, 2, 41, 15}, - - // 9 - new int [] {2, 146, 116}, - new int [] {3, 58, 36, 2, 59, 37}, - new int [] {4, 36, 16, 4, 37, 17}, - new int [] {4, 36, 12, 4, 37, 13}, - - // 10 - new int [] {2, 86, 68, 2, 87, 69}, - new int [] {4, 69, 43, 1, 70, 44}, - new int [] {6, 43, 19, 2, 44, 20}, - new int [] {6, 43, 15, 2, 44, 16} - }; - - - public int DataCount { get; private set; } - public int TotalCount { get; set; } - - public QRRSBlock(int totalCount, int dataCount) - : this() - { - TotalCount = totalCount; - DataCount = dataCount; - } - public static List GetRSBlocks(int typeNumber, QRErrorCorrectLevel errorCorrectLevel) - { - - int[] rsBlock = GetRsBlockTable(typeNumber, errorCorrectLevel); - - if (rsBlock == null) - { - throw new Error("bad rs block @ typeNumber:" + typeNumber + "/errorCorrectLevel:" + errorCorrectLevel); - } - - int length = (int)rsBlock.Length / 3; - - var list = new List(); - - for (int i = 0; i < length; i++) - { - - int count = rsBlock[i * 3 + 0]; - int totalCount = rsBlock[i * 3 + 1]; - int dataCount = rsBlock[i * 3 + 2]; - - for (int j = 0; j < count; j++) - { - list.Add(new QRRSBlock(totalCount, dataCount)); - } - } - - return list; - } - - private static int[] GetRsBlockTable(int typeNumber, QRErrorCorrectLevel errorCorrectLevel) - { - switch (errorCorrectLevel) - { - case QRErrorCorrectLevel.L: - return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 0]; - case QRErrorCorrectLevel.M: - return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 1]; - case QRErrorCorrectLevel.Q: - return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 2]; - case QRErrorCorrectLevel.H: - return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 3]; - default: - return null; - } - } - } - - public class QRCode - { - private const int PAD0 = 0xEC; - private const int PAD1 = 0x11; - private List m_dataList = new List(); - private int m_typeNumber; - private DataCache m_dataCache; - private int m_moduleCount; - private bool?[][] m_modules; - private QRErrorCorrectLevel m_errorCorrectLevel; - public QRCode(Options options) - : this(options.TypeNumber, options.CorrectLevel) - { - AddData(options.Text); - } - - public QRCode(int typeNumber, QRErrorCorrectLevel level) - { - m_typeNumber = typeNumber; - m_errorCorrectLevel = level; - m_dataCache = null; - } - - public void AddData(string data) - { - m_dataCache = null; - m_dataList.Add(new QR8bitByte(data)); - } - - public void Make() - { - MakeImpl(false, GetBestMaskPattern()); - } - - private QRMaskPattern GetBestMaskPattern() - { - double minLostPoint = 0; - QRMaskPattern pattern = 0; - for (int i = 0; i < 8; i++) - { - this.MakeImpl(true, (QRMaskPattern)i); - - double lostPoint = QRUtil.GetLostPoint(this); - - if (i == 0 || minLostPoint > lostPoint) - { - minLostPoint = lostPoint; - pattern = (QRMaskPattern)i; - } - } - - return pattern; - } - - - - private void MakeImpl(bool test, QRMaskPattern maskPattern) - { - m_moduleCount = this.m_typeNumber * 4 + 17; - m_modules = new bool?[m_moduleCount][]; - for (int row = 0; row < m_moduleCount; row++) - { - - m_modules[row] = new bool?[(m_moduleCount)]; - - for (var col = 0; col < m_moduleCount; col++) - { - m_modules[row][col] = null; //(col + row) % 3; - } - } - - this.SetupPositionProbePattern(0, 0); - this.SetupPositionProbePattern(m_moduleCount - 7, 0); - this.SetupPositionProbePattern(0, m_moduleCount - 7); - this.SetupPositionAdjustPattern(); - this.SetupTimingPattern(); - this.setupTypeInfo(test, maskPattern); - - if (m_typeNumber >= 7) - { - this.setupTypeNumber(test); - } - - if (this.m_dataCache == null) - { - this.m_dataCache = CreateData(this.m_typeNumber, this.m_errorCorrectLevel, this.m_dataList); - } - - MapData(this.m_dataCache, maskPattern); - - } - - public bool IsDark(int row, int col) - { - return m_modules[(int)row][(int)col].Value; - } - - private void SetupTimingPattern() - { - for (var r = 8; r < this.m_moduleCount - 8; r++) - { - if (this.m_modules[r][6] != null) - { - continue; - } - this.m_modules[r][6] = (r % 2 == 0); - } - - for (var c = 8; c < this.m_moduleCount - 8; c++) - { - if (this.m_modules[6][c] != null) - { - continue; - } - this.m_modules[6][c] = (c % 2 == 0); - } - } - - private void setupTypeNumber(bool test) - { - var bits = QRUtil.GetBCHTypeNumber(m_typeNumber); - - for (var i = 0; i < 18; i++) - { - var mod = (!test && ((bits >> i) & 1) == 1); - this.m_modules[(int)Math.Floor((double) (i / 3))][i % 3 + this.m_moduleCount - 8 - 3] = mod; - } - - for (var i = 0; i < 18; i++) - { - var mod = (!test && ((bits >> i) & 1) == 1); - this.m_modules[i % 3 + this.m_moduleCount - 8 - 3][(int)Math.Floor((double) (i / 3))] = mod; - } - } - private void SetupPositionAdjustPattern() - { - var pos = QRUtil.GetPatternPosition(m_typeNumber); - - for (var i = 0; i < pos.Length; i++) - { - - for (var j = 0; j < pos.Length; j++) - { - - var row = pos[i]; - var col = pos[j]; - - if (this.m_modules[row][col] != null) - { - continue; - } - - for (var r = -2; r <= 2; r++) - { - - for (var c = -2; c <= 2; c++) - { - - if (r == -2 || r == 2 || c == -2 || c == 2 - || (r == 0 && c == 0)) - { - this.m_modules[row + r][col + c] = true; - } - else - { - this.m_modules[row + r][col + c] = false; - } - } - } - } - } - } - - - private void setupTypeInfo(bool test, QRMaskPattern maskPattern) - { - - var data = ((int)this.m_errorCorrectLevel << 3) | (int)maskPattern; - var bits = QRUtil.GetBCHTypeInfo(data); - - // vertical - for (var i = 0; i < 15; i++) - { - - var mod = (!test && ((bits >> i) & 1) == 1); - - if (i < 6) - { - this.m_modules[i][8] = mod; - } - else if (i < 8) - { - this.m_modules[i + 1][8] = mod; - } - else - { - this.m_modules[this.m_moduleCount - 15 + i][8] = mod; - } - } - - // horizontal - for (var i = 0; i < 15; i++) - { - - var mod = (!test && ((bits >> i) & 1) == 1); - - if (i < 8) - { - this.m_modules[8][this.m_moduleCount - i - 1] = mod; - } - else if (i < 9) - { - this.m_modules[8][15 - i - 1 + 1] = mod; - } - else - { - this.m_modules[8][15 - i - 1] = mod; - } - } - - // fixed module - this.m_modules[this.m_moduleCount - 8][8] = (!test); - - } - - private void MapData(DataCache data, QRMaskPattern maskPattern) - { - - int inc = -1; - int row = (int)this.m_moduleCount - 1; - int bitIndex = 7; - int byteIndex = 0; - - for (var col = this.m_moduleCount - 1; col > 0; col -= 2) - { - - if (col == 6) col--; - - while (true) - { - - for (int c = 0; c < 2; c++) - { - - if (this.m_modules[row][col - c] == null) - { - - bool dark = false; - - if (byteIndex < data.Count) - { - dark = (((Convert.ToUInt32(data[byteIndex]) >> bitIndex) & 1) == 1); - } - - bool mask = QRUtil.GetMask(maskPattern, (int)row, col - c); - - if (mask) - { - dark = !dark; - } - - this.m_modules[row][col - c] = dark; - bitIndex--; - - if (bitIndex == -1) - { - byteIndex++; - bitIndex = 7; - } - } - } - - row += inc; - - if (row < 0 || this.m_moduleCount <= row) - { - row -= inc; - inc = -inc; - break; - } - } - } - - } - - private DataCache CreateData(int typeNumber, QRErrorCorrectLevel errorCorrectLevel, List dataList) - { - List rsBlocks = QRRSBlock.GetRSBlocks(typeNumber, errorCorrectLevel); - - var buffer = new QRBitBuffer(); - - for (int i = 0; i < dataList.Count; i++) - { - QR8bitByte data = dataList[i]; - - buffer.Put((int)data.Mode, 4); - buffer.Put(data.Length, QRUtil.GetLengthInBits(data.Mode, typeNumber)); - data.Write(buffer); - } - - // calc num max data. - int totalDataCount = 0; - for (var i = 0; i < rsBlocks.Count; i++) - { - totalDataCount += rsBlocks[i].DataCount; - } - - if (buffer.GetLengthInBits() > totalDataCount * 8) - { - throw new Error("code length overflow. (" - + buffer.GetLengthInBits() - + ">" - + totalDataCount * 8 - + ")"); - } - - // end code - if (buffer.GetLengthInBits() + 4 <= totalDataCount * 8) - { - buffer.Put(0, 4); - } - - // padding - while (buffer.GetLengthInBits() % 8 != 0) - { - buffer.PutBit(false); - } - - // padding - while (true) - { - - if (buffer.GetLengthInBits() >= totalDataCount * 8) - { - break; - } - buffer.Put(QRCode.PAD0, 8); - - if (buffer.GetLengthInBits() >= totalDataCount * 8) - { - break; - } - buffer.Put(QRCode.PAD1, 8); - } - - return CreateBytes(buffer, rsBlocks); - } - - private DataCache CreateBytes(QRBitBuffer buffer, List rsBlocks) - { - - int offset = 0; - - int maxDcCount = 0; - int maxEcCount = 0; - - var dcdata = new DataCache[(rsBlocks.Count)]; - var ecdata = new DataCache[(rsBlocks.Count)]; - - for (int r = 0; r < rsBlocks.Count; r++) - { - - int dcCount = rsBlocks[(int)r].DataCount; - int ecCount = rsBlocks[(int)r].TotalCount - dcCount; - - maxDcCount = Math.Max(maxDcCount, dcCount); - maxEcCount = Math.Max(maxEcCount, ecCount); - - dcdata[r] = new DataCache(dcCount); - - for (int i = 0; i < dcdata[r].Count; i++) - { - dcdata[r][i] = 0xff & buffer.m_buffer[(int)(i + offset)]; - } - offset += dcCount; - - QRPolynomial rsPoly = QRUtil.GetErrorCorrectPolynomial(ecCount); - QRPolynomial rawPoly = new QRPolynomial(dcdata[r], rsPoly.GetLength() - 1); - - var modPoly = rawPoly.Mod(rsPoly); - ecdata[r] = new DataCache(rsPoly.GetLength() - 1); - for (int i = 0; i < ecdata[r].Count; i++) - { - int modIndex = i + modPoly.GetLength() - (int)ecdata[r].Count; - ecdata[r][i] = (modIndex >= 0) ? modPoly.Get(modIndex) : 0; - } - - } - - int totalCodeCount = 0; - for (int i = 0; i < rsBlocks.Count; i++) - { - totalCodeCount += rsBlocks[(int)i].TotalCount; - } - - var data = new DataCache(totalCodeCount); - int index = 0; - - for (int i = 0; i < maxDcCount; i++) - { - for (int r = 0; r < rsBlocks.Count; r++) - { - if (i < dcdata[r].Count) - { - data[index++] = dcdata[r][i]; - } - } - } - - for (int i = 0; i < maxEcCount; i++) - { - for (int r = 0; r < rsBlocks.Count; r++) - { - if (i < ecdata[r].Count) - { - data[index++] = ecdata[r][i]; - } - } - } - - return data; - - } - private void SetupPositionProbePattern(int row, int col) - { - for (int r = -1; r <= 7; r++) - { - - if (row + r <= -1 || this.m_moduleCount <= row + r) continue; - - for (int c = -1; c <= 7; c++) - { - - if (col + c <= -1 || this.m_moduleCount <= col + c) continue; - - if ((0 <= r && r <= 6 && (c == 0 || c == 6)) - || (0 <= c && c <= 6 && (r == 0 || r == 6)) - || (2 <= r && r <= 4 && 2 <= c && c <= 4)) - { - this.m_modules[row + r][col + c] = true; - } - else - { - this.m_modules[row + r][col + c] = false; - } - } - } - } - - public int GetModuleCount() - { - return this.m_moduleCount; - } - - internal int getBestMaskPattern() - { - - double minLostPoint = 0; - int pattern = 0; - - for (int i = 0; i < 8; i++) - { - - this.MakeImpl(true, (QRMaskPattern)i); - - double lostPoint = QRUtil.GetLostPoint(this); - - if (i == 0 || minLostPoint > lostPoint) - { - minLostPoint = lostPoint; - pattern = i; - } - } - - return pattern; - } - } - - public class QRBitBuffer - { - internal List m_buffer = new List(); - private int m_length = 0; - public bool Get(int index) - { - int bufIndex = Convert.ToInt32(Math.Floor((double) (index / 8))); - return ((Convert.ToUInt32(this.m_buffer[bufIndex]) >> (7 - index % 8)) & 1) == 1; - } - - public void Put(int num, int length) - { - for (var i = 0; i < length; i++) - { - this.PutBit(((Convert.ToUInt32(num) >> (length - i - 1)) & 1) == 1); - } - } - - public int GetLengthInBits() - { - return m_length; - } - - public void PutBit(bool bit) - { - - int bufIndex = (int)Math.Floor((double) (this.m_length / 8)); - if (this.m_buffer.Count <= bufIndex) - { - this.m_buffer.Add(0); - } - - if (bit) - { - this.m_buffer[bufIndex] |= (int)(Convert.ToUInt32(0x80) >> (this.m_length % 8)); - } - this.m_length++; - } - } -} diff --git a/shadowsocks-csharp/3rd/SimpleJson.cs b/shadowsocks-csharp/3rd/SimpleJson.cs index d8a3397f..2850137d 100644 --- a/shadowsocks-csharp/3rd/SimpleJson.cs +++ b/shadowsocks-csharp/3rd/SimpleJson.cs @@ -589,67 +589,6 @@ namespace SimpleJson return SerializeObject(json, CurrentJsonSerializerStrategy); } - public static string EscapeToJavascriptString(string jsonString) - { - if (string.IsNullOrEmpty(jsonString)) - { - return jsonString; - } - - StringBuilder sb = new StringBuilder(); - char c; - - for (int i = 0; i < jsonString.Length; ) - { - c = jsonString[i++]; - - if (c == '\\') - { - int remainingLength = jsonString.Length - i; - if (remainingLength >= 2) - { - char lookahead = jsonString[i]; - if (lookahead == '\\') - { - sb.Append('\\'); - ++i; - } - else if (lookahead == '"') - { - sb.Append("\""); - ++i; - } - else if (lookahead == 't') - { - sb.Append('\t'); - ++i; - } - else if (lookahead == 'b') - { - sb.Append('\b'); - ++i; - } - else if (lookahead == 'n') - { - sb.Append('\n'); - ++i; - } - else if (lookahead == 'r') - { - sb.Append('\r'); - ++i; - } - } - } - else - { - sb.Append(c); - } - } - - return sb.ToString(); - } - protected static IDictionary ParseObject(char[] json, ref int index, ref bool success) { IDictionary table = new JsonObject(); diff --git a/shadowsocks-csharp/3rd/zxing/BitArray.cs b/shadowsocks-csharp/3rd/zxing/BitArray.cs new file mode 100755 index 00000000..b41484ca --- /dev/null +++ b/shadowsocks-csharp/3rd/zxing/BitArray.cs @@ -0,0 +1,160 @@ +/* +* Copyright 2007 ZXing authors +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; + +namespace ZXing.Common +{ + /// + /// A simple, fast array of bits, represented compactly by an array of ints internally. + /// + /// Sean Owen + public sealed class BitArray + { + private int[] bits; + private int size; + + public int Size + { + get + { + return size; + } + } + + public int SizeInBytes + { + get + { + return (size + 7) >> 3; + } + } + + public bool this[int i] + { + get + { + return (bits[i >> 5] & (1 << (i & 0x1F))) != 0; + } + } + + public BitArray() + { + this.size = 0; + this.bits = new int[1]; + } + + + private void ensureCapacity(int size) + { + if (size > bits.Length << 5) + { + int[] newBits = makeArray(size); + System.Array.Copy(bits, 0, newBits, 0, bits.Length); + bits = newBits; + } + } + + /// + /// Appends the bit. + /// + /// The bit. + public void appendBit(bool bit) + { + ensureCapacity(size + 1); + if (bit) + { + bits[size >> 5] |= 1 << (size & 0x1F); + } + size++; + } + + /// + /// Appends the least-significant bits, from value, in order from most-significant to + /// least-significant. For example, appending 6 bits from 0x000001E will append the bits + /// 0, 1, 1, 1, 1, 0 in that order. + /// + /// containing bits to append + /// bits from value to append + public void appendBits(int value, int numBits) + { + if (numBits < 0 || numBits > 32) + { + throw new ArgumentException("Num bits must be between 0 and 32"); + } + ensureCapacity(size + numBits); + for (int numBitsLeft = numBits; numBitsLeft > 0; numBitsLeft--) + { + appendBit(((value >> (numBitsLeft - 1)) & 0x01) == 1); + } + } + + public void appendBitArray(BitArray other) + { + int otherSize = other.size; + ensureCapacity(size + otherSize); + for (int i = 0; i < otherSize; i++) + { + appendBit(other[i]); + } + } + + public void xor(BitArray other) + { + if (bits.Length != other.bits.Length) + { + throw new ArgumentException("Sizes don't match"); + } + for (int i = 0; i < bits.Length; i++) + { + // The last byte could be incomplete (i.e. not have 8 bits in + // it) but there is no problem since 0 XOR 0 == 0. + bits[i] ^= other.bits[i]; + } + } + + /// + /// Toes the bytes. + /// + /// first bit to start writing + /// array to write into. Bytes are written most-significant byte first. This is the opposite + /// of the internal representation, which is exposed by BitArray + /// position in array to start writing + /// how many bytes to write + public void toBytes(int bitOffset, byte[] array, int offset, int numBytes) + { + for (int i = 0; i < numBytes; i++) + { + int theByte = 0; + for (int j = 0; j < 8; j++) + { + if (this[bitOffset]) + { + theByte |= 1 << (7 - j); + } + bitOffset++; + } + array[offset + i] = (byte)theByte; + } + } + + private static int[] makeArray(int size) + { + return new int[(size + 31) >> 5]; + } + + } +} \ No newline at end of file diff --git a/shadowsocks-csharp/3rd/zxing/BlockPair.cs b/shadowsocks-csharp/3rd/zxing/BlockPair.cs new file mode 100755 index 00000000..b1afff46 --- /dev/null +++ b/shadowsocks-csharp/3rd/zxing/BlockPair.cs @@ -0,0 +1,40 @@ +/* +* Copyright 2008 ZXing authors +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +namespace ZXing.QrCode.Internal +{ + internal sealed class BlockPair + { + private readonly byte[] dataBytes; + private readonly byte[] errorCorrectionBytes; + + public BlockPair(byte[] data, byte[] errorCorrection) + { + dataBytes = data; + errorCorrectionBytes = errorCorrection; + } + + public byte[] DataBytes + { + get { return dataBytes; } + } + + public byte[] ErrorCorrectionBytes + { + get { return errorCorrectionBytes; } + } + } +} \ No newline at end of file diff --git a/shadowsocks-csharp/3rd/zxing/ByteMatrix.cs b/shadowsocks-csharp/3rd/zxing/ByteMatrix.cs new file mode 100755 index 00000000..e3d372fd --- /dev/null +++ b/shadowsocks-csharp/3rd/zxing/ByteMatrix.cs @@ -0,0 +1,148 @@ +/* + * Copyright 2008 ZXing authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using System; +using System.Text; + +namespace ZXing.QrCode.Internal +{ + /// + /// JAVAPORT: The original code was a 2D array of ints, but since it only ever gets assigned + /// 0, 1 and 2 I'm going to use less memory and go with bytes. + /// + /// dswitkin@google.com (Daniel Switkin) + public sealed class ByteMatrix + { + private readonly byte[][] bytes; + private readonly int width; + private readonly int height; + + /// + /// Initializes a new instance of the class. + /// + /// The width. + /// The height. + public ByteMatrix(int width, int height) + { + bytes = new byte[height][]; + for (var i = 0; i < height; i++) + bytes[i] = new byte[width]; + this.width = width; + this.height = height; + } + + /// + /// Gets the height. + /// + public int Height + { + get { return height; } + } + + /// + /// Gets the width. + /// + public int Width + { + get { return width; } + } + + /// + /// Gets or sets the with the specified x. + /// + public int this[int x, int y] + { + get { return bytes[y][x]; } + set { bytes[y][x] = (byte)value; } + } + + /// + /// an internal representation as bytes, in row-major order. array[y][x] represents point (x,y) + /// + public byte[][] Array + { + get { return bytes; } + } + + /// + /// Sets the specified x. + /// + /// The x. + /// The y. + /// The value. + public void set(int x, int y, byte value) + { + bytes[y][x] = value; + } + + /// + /// Sets the specified x. + /// + /// The x. + /// The y. + /// if set to true [value]. + public void set(int x, int y, bool value) + { + bytes[y][x] = (byte)(value ? 1 : 0); + } + + /// + /// Clears the specified value. + /// + /// The value. + public void clear(byte value) + { + for (int y = 0; y < height; ++y) + { + for (int x = 0; x < width; ++x) + { + bytes[y][x] = value; + } + } + } + + /// + /// Returns a that represents this instance. + /// + /// + /// A that represents this instance. + /// + override public String ToString() + { + var result = new StringBuilder(2 * width * height + 2); + for (int y = 0; y < height; ++y) + { + for (int x = 0; x < width; ++x) + { + switch (bytes[y][x]) + { + case 0: + result.Append(" 0"); + break; + case 1: + result.Append(" 1"); + break; + default: + result.Append(" "); + break; + } + } + result.Append('\n'); + } + return result.ToString(); + } + } +} \ No newline at end of file diff --git a/shadowsocks-csharp/3rd/zxing/Encoder.cs b/shadowsocks-csharp/3rd/zxing/Encoder.cs new file mode 100755 index 00000000..ae9996e9 --- /dev/null +++ b/shadowsocks-csharp/3rd/zxing/Encoder.cs @@ -0,0 +1,526 @@ +/* +* Copyright 2008 ZXing authors +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections.Generic; +using System.Text; + +using ZXing.Common; +using ZXing.Common.ReedSolomon; + +namespace ZXing.QrCode.Internal +{ + /// + /// + /// satorux@google.com (Satoru Takabayashi) - creator + /// dswitkin@google.com (Daniel Switkin) - ported from C++ + public static class Encoder + { + + + internal static String DEFAULT_BYTE_MODE_ENCODING = "ISO-8859-1"; + + // The mask penalty calculation is complicated. See Table 21 of JISX0510:2004 (p.45) for details. + // Basically it applies four rules and summate all penalties. + private static int calculateMaskPenalty(ByteMatrix matrix) + { + return MaskUtil.applyMaskPenaltyRule1(matrix) + + MaskUtil.applyMaskPenaltyRule2(matrix) + + MaskUtil.applyMaskPenaltyRule3(matrix) + + MaskUtil.applyMaskPenaltyRule4(matrix); + } + + /// + /// Encode "bytes" with the error correction level "ecLevel". The encoding mode will be chosen + /// internally by chooseMode(). On success, store the result in "qrCode". + /// We recommend you to use QRCode.EC_LEVEL_L (the lowest level) for + /// "getECLevel" since our primary use is to show QR code on desktop screens. We don't need very + /// strong error correction for this purpose. + /// Note that there is no way to encode bytes in MODE_KANJI. We might want to add EncodeWithMode() + /// with which clients can specify the encoding mode. For now, we don't need the functionality. + /// + /// text to encode + /// error correction level to use + /// representing the encoded QR code + public static QRCode encode(String content, ErrorCorrectionLevel ecLevel) + { + // Determine what character encoding has been specified by the caller, if any +#if !SILVERLIGHT || WINDOWS_PHONE + String encoding = DEFAULT_BYTE_MODE_ENCODING; + //bool generateECI = !DEFAULT_BYTE_MODE_ENCODING.Equals(encoding); +#else + // Silverlight supports only UTF-8 and UTF-16 out-of-the-box + const string encoding = "UTF-8"; + // caller of the method can only control if the ECI segment should be written + // character set is fixed to UTF-8; but some scanners doesn't like the ECI segment + bool generateECI = (hints != null && hints.ContainsKey(EncodeHintType.CHARACTER_SET)); +#endif + + // Pick an encoding mode appropriate for the content. Note that this will not attempt to use + // multiple modes / segments even if that were more efficient. Twould be nice. + Mode mode = Mode.BYTE; + + // This will store the header information, like mode and + // length, as well as "header" segments like an ECI segment. + BitArray headerBits = new BitArray(); + + /* + // Append ECI segment if applicable + if (mode == Mode.BYTE && generateECI) + { + CharacterSetECI eci = CharacterSetECI.getCharacterSetECIByName(encoding); + if (eci != null) + { + var eciIsExplicitDisabled = (hints != null && hints.ContainsKey(EncodeHintType.DISABLE_ECI) ? (bool)hints[EncodeHintType.DISABLE_ECI] : false); + if (!eciIsExplicitDisabled) + { + appendECI(eci, headerBits); + } + } + } + * */ + + // (With ECI in place,) Write the mode marker + appendModeInfo(mode, headerBits); + + // Collect data within the main segment, separately, to count its size if needed. Don't add it to + // main payload yet. + BitArray dataBits = new BitArray(); + appendBytes(content, mode, dataBits, encoding); + + // Hard part: need to know version to know how many bits length takes. But need to know how many + // bits it takes to know version. First we take a guess at version by assuming version will be + // the minimum, 1: + + int provisionalBitsNeeded = headerBits.Size + + mode.getCharacterCountBits(Version.getVersionForNumber(1)) + + dataBits.Size; + Version provisionalVersion = chooseVersion(provisionalBitsNeeded, ecLevel); + + // Use that guess to calculate the right version. I am still not sure this works in 100% of cases. + int bitsNeeded = headerBits.Size + + mode.getCharacterCountBits(provisionalVersion) + + dataBits.Size; + Version version = chooseVersion(bitsNeeded, ecLevel); + + BitArray headerAndDataBits = new BitArray(); + headerAndDataBits.appendBitArray(headerBits); + // Find "length" of main segment and write it + int numLetters = mode == Mode.BYTE ? dataBits.SizeInBytes : content.Length; + appendLengthInfo(numLetters, version, mode, headerAndDataBits); + // Put data together into the overall payload + headerAndDataBits.appendBitArray(dataBits); + + Version.ECBlocks ecBlocks = version.getECBlocksForLevel(ecLevel); + int numDataBytes = version.TotalCodewords - ecBlocks.TotalECCodewords; + + // Terminate the bits properly. + terminateBits(numDataBytes, headerAndDataBits); + + // Interleave data bits with error correction code. + BitArray finalBits = interleaveWithECBytes(headerAndDataBits, + version.TotalCodewords, + numDataBytes, + ecBlocks.NumBlocks); + + QRCode qrCode = new QRCode + { + ECLevel = ecLevel, + Mode = mode, + Version = version + }; + + // Choose the mask pattern and set to "qrCode". + int dimension = version.DimensionForVersion; + ByteMatrix matrix = new ByteMatrix(dimension, dimension); + int maskPattern = chooseMaskPattern(finalBits, ecLevel, version, matrix); + qrCode.MaskPattern = maskPattern; + + // Build the matrix and set it to "qrCode". + MatrixUtil.buildMatrix(finalBits, ecLevel, version, maskPattern, matrix); + qrCode.Matrix = matrix; + + return qrCode; + } + + + private static int chooseMaskPattern(BitArray bits, + ErrorCorrectionLevel ecLevel, + Version version, + ByteMatrix matrix) + { + int minPenalty = Int32.MaxValue; // Lower penalty is better. + int bestMaskPattern = -1; + // We try all mask patterns to choose the best one. + for (int maskPattern = 0; maskPattern < QRCode.NUM_MASK_PATTERNS; maskPattern++) + { + + MatrixUtil.buildMatrix(bits, ecLevel, version, maskPattern, matrix); + int penalty = calculateMaskPenalty(matrix); + if (penalty < minPenalty) + { + + minPenalty = penalty; + bestMaskPattern = maskPattern; + } + } + return bestMaskPattern; + } + + private static Version chooseVersion(int numInputBits, ErrorCorrectionLevel ecLevel) + { + // In the following comments, we use numbers of Version 7-H. + for (int versionNum = 1; versionNum <= 40; versionNum++) + { + Version version = Version.getVersionForNumber(versionNum); + // numBytes = 196 + int numBytes = version.TotalCodewords; + // getNumECBytes = 130 + Version.ECBlocks ecBlocks = version.getECBlocksForLevel(ecLevel); + int numEcBytes = ecBlocks.TotalECCodewords; + // getNumDataBytes = 196 - 130 = 66 + int numDataBytes = numBytes - numEcBytes; + int totalInputBytes = (numInputBits + 7) / 8; + if (numDataBytes >= totalInputBytes) + { + return version; + } + } + throw new Exception("Data too big"); + } + + /// + /// Terminate bits as described in 8.4.8 and 8.4.9 of JISX0510:2004 (p.24). + /// + /// The num data bytes. + /// The bits. + internal static void terminateBits(int numDataBytes, BitArray bits) + { + int capacity = numDataBytes << 3; + if (bits.Size > capacity) + { + throw new Exception("data bits cannot fit in the QR Code" + bits.Size + " > " + + capacity); + } + for (int i = 0; i < 4 && bits.Size < capacity; ++i) + { + bits.appendBit(false); + } + // Append termination bits. See 8.4.8 of JISX0510:2004 (p.24) for details. + // If the last byte isn't 8-bit aligned, we'll add padding bits. + int numBitsInLastByte = bits.Size & 0x07; + if (numBitsInLastByte > 0) + { + for (int i = numBitsInLastByte; i < 8; i++) + { + bits.appendBit(false); + } + } + // If we have more space, we'll fill the space with padding patterns defined in 8.4.9 (p.24). + int numPaddingBytes = numDataBytes - bits.SizeInBytes; + for (int i = 0; i < numPaddingBytes; ++i) + { + bits.appendBits((i & 0x01) == 0 ? 0xEC : 0x11, 8); + } + if (bits.Size != capacity) + { + throw new Exception("Bits size does not equal capacity"); + } + } + + /// + /// Get number of data bytes and number of error correction bytes for block id "blockID". Store + /// the result in "numDataBytesInBlock", and "numECBytesInBlock". See table 12 in 8.5.1 of + /// JISX0510:2004 (p.30) + /// + /// The num total bytes. + /// The num data bytes. + /// The num RS blocks. + /// The block ID. + /// The num data bytes in block. + /// The num EC bytes in block. + internal static void getNumDataBytesAndNumECBytesForBlockID(int numTotalBytes, + int numDataBytes, + int numRSBlocks, + int blockID, + int[] numDataBytesInBlock, + int[] numECBytesInBlock) + { + if (blockID >= numRSBlocks) + { + throw new Exception("Block ID too large"); + } + // numRsBlocksInGroup2 = 196 % 5 = 1 + int numRsBlocksInGroup2 = numTotalBytes % numRSBlocks; + // numRsBlocksInGroup1 = 5 - 1 = 4 + int numRsBlocksInGroup1 = numRSBlocks - numRsBlocksInGroup2; + // numTotalBytesInGroup1 = 196 / 5 = 39 + int numTotalBytesInGroup1 = numTotalBytes / numRSBlocks; + // numTotalBytesInGroup2 = 39 + 1 = 40 + int numTotalBytesInGroup2 = numTotalBytesInGroup1 + 1; + // numDataBytesInGroup1 = 66 / 5 = 13 + int numDataBytesInGroup1 = numDataBytes / numRSBlocks; + // numDataBytesInGroup2 = 13 + 1 = 14 + int numDataBytesInGroup2 = numDataBytesInGroup1 + 1; + // numEcBytesInGroup1 = 39 - 13 = 26 + int numEcBytesInGroup1 = numTotalBytesInGroup1 - numDataBytesInGroup1; + // numEcBytesInGroup2 = 40 - 14 = 26 + int numEcBytesInGroup2 = numTotalBytesInGroup2 - numDataBytesInGroup2; + // Sanity checks. + // 26 = 26 + if (numEcBytesInGroup1 != numEcBytesInGroup2) + { + + throw new Exception("EC bytes mismatch"); + } + // 5 = 4 + 1. + if (numRSBlocks != numRsBlocksInGroup1 + numRsBlocksInGroup2) + { + + throw new Exception("RS blocks mismatch"); + } + // 196 = (13 + 26) * 4 + (14 + 26) * 1 + if (numTotalBytes != + ((numDataBytesInGroup1 + numEcBytesInGroup1) * + numRsBlocksInGroup1) + + ((numDataBytesInGroup2 + numEcBytesInGroup2) * + numRsBlocksInGroup2)) + { + throw new Exception("Total bytes mismatch"); + } + + if (blockID < numRsBlocksInGroup1) + { + + numDataBytesInBlock[0] = numDataBytesInGroup1; + numECBytesInBlock[0] = numEcBytesInGroup1; + } + else + { + + + numDataBytesInBlock[0] = numDataBytesInGroup2; + numECBytesInBlock[0] = numEcBytesInGroup2; + } + } + + /// + /// Interleave "bits" with corresponding error correction bytes. On success, store the result in + /// "result". The interleave rule is complicated. See 8.6 of JISX0510:2004 (p.37) for details. + /// + /// The bits. + /// The num total bytes. + /// The num data bytes. + /// The num RS blocks. + /// + internal static BitArray interleaveWithECBytes(BitArray bits, + int numTotalBytes, + int numDataBytes, + int numRSBlocks) + { + // "bits" must have "getNumDataBytes" bytes of data. + if (bits.SizeInBytes != numDataBytes) + { + + throw new Exception("Number of bits and data bytes does not match"); + } + + // Step 1. Divide data bytes into blocks and generate error correction bytes for them. We'll + // store the divided data bytes blocks and error correction bytes blocks into "blocks". + int dataBytesOffset = 0; + int maxNumDataBytes = 0; + int maxNumEcBytes = 0; + + // Since, we know the number of reedsolmon blocks, we can initialize the vector with the number. + var blocks = new List(numRSBlocks); + + for (int i = 0; i < numRSBlocks; ++i) + { + + int[] numDataBytesInBlock = new int[1]; + int[] numEcBytesInBlock = new int[1]; + getNumDataBytesAndNumECBytesForBlockID( + numTotalBytes, numDataBytes, numRSBlocks, i, + numDataBytesInBlock, numEcBytesInBlock); + + int size = numDataBytesInBlock[0]; + byte[] dataBytes = new byte[size]; + bits.toBytes(8 * dataBytesOffset, dataBytes, 0, size); + byte[] ecBytes = generateECBytes(dataBytes, numEcBytesInBlock[0]); + blocks.Add(new BlockPair(dataBytes, ecBytes)); + + maxNumDataBytes = Math.Max(maxNumDataBytes, size); + maxNumEcBytes = Math.Max(maxNumEcBytes, ecBytes.Length); + dataBytesOffset += numDataBytesInBlock[0]; + } + if (numDataBytes != dataBytesOffset) + { + + throw new Exception("Data bytes does not match offset"); + } + + BitArray result = new BitArray(); + + // First, place data blocks. + for (int i = 0; i < maxNumDataBytes; ++i) + { + foreach (BlockPair block in blocks) + { + byte[] dataBytes = block.DataBytes; + if (i < dataBytes.Length) + { + result.appendBits(dataBytes[i], 8); + } + } + } + // Then, place error correction blocks. + for (int i = 0; i < maxNumEcBytes; ++i) + { + foreach (BlockPair block in blocks) + { + byte[] ecBytes = block.ErrorCorrectionBytes; + if (i < ecBytes.Length) + { + result.appendBits(ecBytes[i], 8); + } + } + } + if (numTotalBytes != result.SizeInBytes) + { // Should be same. + throw new Exception("Interleaving error: " + numTotalBytes + " and " + + result.SizeInBytes + " differ."); + } + + return result; + } + + internal static byte[] generateECBytes(byte[] dataBytes, int numEcBytesInBlock) + { + int numDataBytes = dataBytes.Length; + int[] toEncode = new int[numDataBytes + numEcBytesInBlock]; + for (int i = 0; i < numDataBytes; i++) + { + toEncode[i] = dataBytes[i] & 0xFF; + + } + new ReedSolomonEncoder(GenericGF.QR_CODE_FIELD_256).encode(toEncode, numEcBytesInBlock); + + byte[] ecBytes = new byte[numEcBytesInBlock]; + for (int i = 0; i < numEcBytesInBlock; i++) + { + ecBytes[i] = (byte)toEncode[numDataBytes + i]; + + } + return ecBytes; + } + + /// + /// Append mode info. On success, store the result in "bits". + /// + /// The mode. + /// The bits. + internal static void appendModeInfo(Mode mode, BitArray bits) + { + bits.appendBits(mode.Bits, 4); + } + + + /// + /// Append length info. On success, store the result in "bits". + /// + /// The num letters. + /// The version. + /// The mode. + /// The bits. + internal static void appendLengthInfo(int numLetters, Version version, Mode mode, BitArray bits) + { + int numBits = mode.getCharacterCountBits(version); + if (numLetters >= (1 << numBits)) + { + throw new Exception(numLetters + " is bigger than " + ((1 << numBits) - 1)); + } + bits.appendBits(numLetters, numBits); + } + + /// + /// Append "bytes" in "mode" mode (encoding) into "bits". On success, store the result in "bits". + /// + /// The content. + /// The mode. + /// The bits. + /// The encoding. + internal static void appendBytes(String content, + Mode mode, + BitArray bits, + String encoding) + { + if (mode.Equals(Mode.BYTE)) + append8BitBytes(content, bits, encoding); + else + throw new Exception("Invalid mode: " + mode); + } + + internal static void append8BitBytes(String content, BitArray bits, String encoding) + { + byte[] bytes; + try + { + bytes = Encoding.GetEncoding(encoding).GetBytes(content); + } +#if WindowsCE + catch (PlatformNotSupportedException) + { + try + { + // WindowsCE doesn't support all encodings. But it is device depended. + // So we try here the some different ones + if (encoding == "ISO-8859-1") + { + bytes = Encoding.GetEncoding(1252).GetBytes(content); + } + else + { + bytes = Encoding.GetEncoding("UTF-8").GetBytes(content); + } + } + catch (Exception uee) + { + throw new WriterException(uee.Message, uee); + } + } +#endif + catch (Exception uee) + { + throw new Exception(uee.Message, uee); + } + foreach (byte b in bytes) + { + bits.appendBits(b, 8); + } + } + + + /* + private static void appendECI(CharacterSetECI eci, BitArray bits) + { + bits.appendBits(Mode.ECI.Bits, 4); + + // This is correct for values up to 127, which is all we need now. + bits.appendBits(eci.Value, 8); + } + * */ + } +} \ No newline at end of file diff --git a/shadowsocks-csharp/3rd/zxing/ErrorCorrectionLevel.cs b/shadowsocks-csharp/3rd/zxing/ErrorCorrectionLevel.cs new file mode 100755 index 00000000..f3b49347 --- /dev/null +++ b/shadowsocks-csharp/3rd/zxing/ErrorCorrectionLevel.cs @@ -0,0 +1,109 @@ +/* +* Copyright 2007 ZXing authors +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; + +namespace ZXing.QrCode.Internal +{ + /// + ///

See ISO 18004:2006, 6.5.1. This enum encapsulates the four error correction levels + /// defined by the QR code standard.

+ /// + /// Sean Owen + public sealed class ErrorCorrectionLevel + { + /// L = ~7% correction + public static readonly ErrorCorrectionLevel L = new ErrorCorrectionLevel(0, 0x01, "L"); + /// M = ~15% correction + public static readonly ErrorCorrectionLevel M = new ErrorCorrectionLevel(1, 0x00, "M"); + /// Q = ~25% correction + public static readonly ErrorCorrectionLevel Q = new ErrorCorrectionLevel(2, 0x03, "Q"); + /// H = ~30% correction + public static readonly ErrorCorrectionLevel H = new ErrorCorrectionLevel(3, 0x02, "H"); + + private static readonly ErrorCorrectionLevel[] FOR_BITS = new [] { M, L, H, Q }; + + private readonly int bits; + + private ErrorCorrectionLevel(int ordinal, int bits, String name) + { + this.ordinal_Renamed_Field = ordinal; + this.bits = bits; + this.name = name; + } + + /// + /// Gets the bits. + /// + public int Bits + { + get + { + return bits; + } + } + + /// + /// Gets the name. + /// + public String Name + { + get + { + return name; + } + } + + private readonly int ordinal_Renamed_Field; + private readonly String name; + + /// + /// Ordinals this instance. + /// + /// + public int ordinal() + { + return ordinal_Renamed_Field; + } + + /// + /// Returns a that represents this instance. + /// + /// + /// A that represents this instance. + /// + public override String ToString() + { + return name; + } + + /// + /// Fors the bits. + /// + /// int containing the two bits encoding a QR Code's error correction level + /// + /// representing the encoded error correction level + /// + public static ErrorCorrectionLevel forBits(int bits) + { + if (bits < 0 || bits >= FOR_BITS.Length) + { + throw new ArgumentException(); + } + return FOR_BITS[bits]; + } + } +} \ No newline at end of file diff --git a/shadowsocks-csharp/3rd/zxing/GenericGF.cs b/shadowsocks-csharp/3rd/zxing/GenericGF.cs new file mode 100755 index 00000000..08f8ca0e --- /dev/null +++ b/shadowsocks-csharp/3rd/zxing/GenericGF.cs @@ -0,0 +1,163 @@ +/* + * Copyright 2007 ZXing authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using System; + +namespace ZXing.Common.ReedSolomon +{ + /// + ///

This class contains utility methods for performing mathematical operations over + /// the Galois Fields. Operations use a given primitive polynomial in calculations.

+ ///

Throughout this package, elements of the GF are represented as an {@code int} + /// for convenience and speed (but at the cost of memory). + ///

+ /// + /// Sean Owen + public sealed class GenericGF + { + public static GenericGF QR_CODE_FIELD_256 = new GenericGF(0x011D, 256, 0); // x^8 + x^4 + x^3 + x^2 + 1 + + private int[] expTable; + private int[] logTable; + private GenericGFPoly zero; + private GenericGFPoly one; + private readonly int size; + private readonly int primitive; + private readonly int generatorBase; + + /// + /// Create a representation of GF(size) using the given primitive polynomial. + /// + /// irreducible polynomial whose coefficients are represented by + /// * the bits of an int, where the least-significant bit represents the constant + /// * coefficient + /// the size of the field + /// the factor b in the generator polynomial can be 0- or 1-based + /// * (g(x) = (x+a^b)(x+a^(b+1))...(x+a^(b+2t-1))). + /// * In most cases it should be 1, but for QR code it is 0. + public GenericGF(int primitive, int size, int genBase) + { + this.primitive = primitive; + this.size = size; + this.generatorBase = genBase; + + expTable = new int[size]; + logTable = new int[size]; + int x = 1; + for (int i = 0; i < size; i++) + { + expTable[i] = x; + x <<= 1; // x = x * 2; we're assuming the generator alpha is 2 + if (x >= size) + { + x ^= primitive; + x &= size - 1; + } + } + for (int i = 0; i < size - 1; i++) + { + logTable[expTable[i]] = i; + } + // logTable[0] == 0 but this should never be used + zero = new GenericGFPoly(this, new int[] { 0 }); + one = new GenericGFPoly(this, new int[] { 1 }); + } + + internal GenericGFPoly Zero + { + get + { + return zero; + } + } + + /// + /// Builds the monomial. + /// + /// The degree. + /// The coefficient. + /// the monomial representing coefficient * x^degree + internal GenericGFPoly buildMonomial(int degree, int coefficient) + { + if (degree < 0) + { + throw new ArgumentException(); + } + if (coefficient == 0) + { + return zero; + } + int[] coefficients = new int[degree + 1]; + coefficients[0] = coefficient; + return new GenericGFPoly(this, coefficients); + } + + /// + /// Implements both addition and subtraction -- they are the same in GF(size). + /// + /// sum/difference of a and b + static internal int addOrSubtract(int a, int b) + { + return a ^ b; + } + + /// + /// Exps the specified a. + /// + /// 2 to the power of a in GF(size) + internal int exp(int a) + { + return expTable[a]; + } + + + /// + /// Inverses the specified a. + /// + /// multiplicative inverse of a + internal int inverse(int a) + { + if (a == 0) + { + throw new ArithmeticException(); + } + return expTable[size - logTable[a] - 1]; + } + + /// + /// Multiplies the specified a with b. + /// + /// A. + /// The b. + /// product of a and b in GF(size) + internal int multiply(int a, int b) + { + if (a == 0 || b == 0) + { + return 0; + } + return expTable[(logTable[a] + logTable[b]) % (size - 1)]; + } + + /// + /// Gets the generator base. + /// + public int GeneratorBase + { + get { return generatorBase; } + } + } +} \ No newline at end of file diff --git a/shadowsocks-csharp/3rd/zxing/GenericGFPoly.cs b/shadowsocks-csharp/3rd/zxing/GenericGFPoly.cs new file mode 100755 index 00000000..eb966579 --- /dev/null +++ b/shadowsocks-csharp/3rd/zxing/GenericGFPoly.cs @@ -0,0 +1,230 @@ +/* + * Copyright 2007 ZXing authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using System; +using System.Text; + +namespace ZXing.Common.ReedSolomon +{ + /// + ///

Represents a polynomial whose coefficients are elements of a GF. + /// Instances of this class are immutable.

+ ///

Much credit is due to William Rucklidge since portions of this code are an indirect + /// port of his C++ Reed-Solomon implementation.

+ /// + /// Sean Owen + internal sealed class GenericGFPoly + { + private readonly GenericGF field; + private readonly int[] coefficients; + + /// + /// Initializes a new instance of the class. + /// + /// the {@link GenericGF} instance representing the field to use + /// to perform computations + /// coefficients as ints representing elements of GF(size), arranged + /// from most significant (highest-power term) coefficient to least significant + /// if argument is null or empty, + /// or if leading coefficient is 0 and this is not a + /// constant polynomial (that is, it is not the monomial "0") + internal GenericGFPoly(GenericGF field, int[] coefficients) + { + if (coefficients.Length == 0) + { + throw new ArgumentException(); + } + this.field = field; + int coefficientsLength = coefficients.Length; + if (coefficientsLength > 1 && coefficients[0] == 0) + { + // Leading term must be non-zero for anything except the constant polynomial "0" + int firstNonZero = 1; + while (firstNonZero < coefficientsLength && coefficients[firstNonZero] == 0) + { + firstNonZero++; + } + if (firstNonZero == coefficientsLength) + { + this.coefficients = new int[]{0}; + } + else + { + this.coefficients = new int[coefficientsLength - firstNonZero]; + Array.Copy(coefficients, + firstNonZero, + this.coefficients, + 0, + this.coefficients.Length); + } + } + else + { + this.coefficients = coefficients; + } + } + + internal int[] Coefficients + { + get { return coefficients; } + } + + /// + /// degree of this polynomial + /// + internal int Degree + { + get + { + return coefficients.Length - 1; + } + } + + /// + /// Gets a value indicating whether this is zero. + /// + /// true iff this polynomial is the monomial "0" + internal bool isZero + { + get { return coefficients[0] == 0; } + } + + /// + /// coefficient of x^degree term in this polynomial + /// + /// The degree. + /// coefficient of x^degree term in this polynomial + internal int getCoefficient(int degree) + { + return coefficients[coefficients.Length - 1 - degree]; + } + + + internal GenericGFPoly addOrSubtract(GenericGFPoly other) + { + if (!field.Equals(other.field)) + { + throw new ArgumentException("GenericGFPolys do not have same GenericGF field"); + } + if (isZero) + { + return other; + } + if (other.isZero) + { + return this; + } + + int[] smallerCoefficients = this.coefficients; + int[] largerCoefficients = other.coefficients; + if (smallerCoefficients.Length > largerCoefficients.Length) + { + int[] temp = smallerCoefficients; + smallerCoefficients = largerCoefficients; + largerCoefficients = temp; + } + int[] sumDiff = new int[largerCoefficients.Length]; + int lengthDiff = largerCoefficients.Length - smallerCoefficients.Length; + // Copy high-order terms only found in higher-degree polynomial's coefficients + Array.Copy(largerCoefficients, 0, sumDiff, 0, lengthDiff); + + for (int i = lengthDiff; i < largerCoefficients.Length; i++) + { + sumDiff[i] = GenericGF.addOrSubtract(smallerCoefficients[i - lengthDiff], largerCoefficients[i]); + } + + return new GenericGFPoly(field, sumDiff); + } + + internal GenericGFPoly multiply(GenericGFPoly other) + { + if (!field.Equals(other.field)) + { + throw new ArgumentException("GenericGFPolys do not have same GenericGF field"); + } + if (isZero || other.isZero) + { + return field.Zero; + } + int[] aCoefficients = this.coefficients; + int aLength = aCoefficients.Length; + int[] bCoefficients = other.coefficients; + int bLength = bCoefficients.Length; + int[] product = new int[aLength + bLength - 1]; + for (int i = 0; i < aLength; i++) + { + int aCoeff = aCoefficients[i]; + for (int j = 0; j < bLength; j++) + { + product[i + j] = GenericGF.addOrSubtract(product[i + j], + field.multiply(aCoeff, bCoefficients[j])); + } + } + return new GenericGFPoly(field, product); + } + + + internal GenericGFPoly multiplyByMonomial(int degree, int coefficient) + { + if (degree < 0) + { + throw new ArgumentException(); + } + if (coefficient == 0) + { + return field.Zero; + } + int size = coefficients.Length; + int[] product = new int[size + degree]; + for (int i = 0; i < size; i++) + { + product[i] = field.multiply(coefficients[i], coefficient); + } + return new GenericGFPoly(field, product); + } + + internal GenericGFPoly[] divide(GenericGFPoly other) + { + if (!field.Equals(other.field)) + { + throw new ArgumentException("GenericGFPolys do not have same GenericGF field"); + } + if (other.isZero) + { + throw new ArgumentException("Divide by 0"); + } + + GenericGFPoly quotient = field.Zero; + GenericGFPoly remainder = this; + + int denominatorLeadingTerm = other.getCoefficient(other.Degree); + int inverseDenominatorLeadingTerm = field.inverse(denominatorLeadingTerm); + + while (remainder.Degree >= other.Degree && !remainder.isZero) + { + int degreeDifference = remainder.Degree - other.Degree; + int scale = field.multiply(remainder.getCoefficient(remainder.Degree), inverseDenominatorLeadingTerm); + GenericGFPoly term = other.multiplyByMonomial(degreeDifference, scale); + GenericGFPoly iterationQuotient = field.buildMonomial(degreeDifference, scale); + quotient = quotient.addOrSubtract(iterationQuotient); + remainder = remainder.addOrSubtract(term); + } + + return new GenericGFPoly[] { quotient, remainder }; + } + + } +} \ No newline at end of file diff --git a/shadowsocks-csharp/3rd/zxing/MaskUtil.cs b/shadowsocks-csharp/3rd/zxing/MaskUtil.cs new file mode 100755 index 00000000..24e85cc1 --- /dev/null +++ b/shadowsocks-csharp/3rd/zxing/MaskUtil.cs @@ -0,0 +1,271 @@ +/* +* Copyright 2008 ZXing authors +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; + +namespace ZXing.QrCode.Internal +{ + /// + /// + /// + /// Satoru Takabayashi + /// Daniel Switkin + /// Sean Owen + public static class MaskUtil + { + // Penalty weights from section 6.8.2.1 + private const int N1 = 3; + private const int N2 = 3; + private const int N3 = 40; + private const int N4 = 10; + + /// + /// Apply mask penalty rule 1 and return the penalty. Find repetitive cells with the same color and + /// give penalty to them. Example: 00000 or 11111. + /// + /// The matrix. + /// + public static int applyMaskPenaltyRule1(ByteMatrix matrix) + { + return applyMaskPenaltyRule1Internal(matrix, true) + applyMaskPenaltyRule1Internal(matrix, false); + } + + /// + /// Apply mask penalty rule 2 and return the penalty. Find 2x2 blocks with the same color and give + /// penalty to them. This is actually equivalent to the spec's rule, which is to find MxN blocks and give a + /// penalty proportional to (M-1)x(N-1), because this is the number of 2x2 blocks inside such a block. + /// + /// The matrix. + /// + public static int applyMaskPenaltyRule2(ByteMatrix matrix) + { + int penalty = 0; + var array = matrix.Array; + int width = matrix.Width; + int height = matrix.Height; + for (int y = 0; y < height - 1; y++) + { + for (int x = 0; x < width - 1; x++) + { + int value = array[y][x]; + if (value == array[y][x + 1] && value == array[y + 1][x] && value == array[y + 1][x + 1]) + { + penalty++; + } + } + } + return N2 * penalty; + } + + /// + /// Apply mask penalty rule 3 and return the penalty. Find consecutive cells of 00001011101 or + /// 10111010000, and give penalty to them. If we find patterns like 000010111010000, we give + /// penalties twice (i.e. 40 * 2). + /// + /// The matrix. + /// + public static int applyMaskPenaltyRule3(ByteMatrix matrix) + { + int numPenalties = 0; + byte[][] array = matrix.Array; + int width = matrix.Width; + int height = matrix.Height; + for (int y = 0; y < height; y++) + { + for (int x = 0; x < width; x++) + { + byte[] arrayY = array[y]; // We can at least optimize this access + if (x + 6 < width && + arrayY[x] == 1 && + arrayY[x + 1] == 0 && + arrayY[x + 2] == 1 && + arrayY[x + 3] == 1 && + arrayY[x + 4] == 1 && + arrayY[x + 5] == 0 && + arrayY[x + 6] == 1 && + (isWhiteHorizontal(arrayY, x - 4, x) || isWhiteHorizontal(arrayY, x + 7, x + 11))) + { + numPenalties++; + } + if (y + 6 < height && + array[y][x] == 1 && + array[y + 1][x] == 0 && + array[y + 2][x] == 1 && + array[y + 3][x] == 1 && + array[y + 4][x] == 1 && + array[y + 5][x] == 0 && + array[y + 6][x] == 1 && + (isWhiteVertical(array, x, y - 4, y) || isWhiteVertical(array, x, y + 7, y + 11))) + { + numPenalties++; + } + } + } + return numPenalties * N3; + } + + private static bool isWhiteHorizontal(byte[] rowArray, int from, int to) + { + for (int i = from; i < to; i++) + { + if (i >= 0 && i < rowArray.Length && rowArray[i] == 1) + { + return false; + } + } + return true; + } + + private static bool isWhiteVertical(byte[][] array, int col, int from, int to) + { + for (int i = from; i < to; i++) + { + if (i >= 0 && i < array.Length && array[i][col] == 1) + { + return false; + } + } + return true; + } + + /// + /// Apply mask penalty rule 4 and return the penalty. Calculate the ratio of dark cells and give + /// penalty if the ratio is far from 50%. It gives 10 penalty for 5% distance. + /// + /// The matrix. + /// + public static int applyMaskPenaltyRule4(ByteMatrix matrix) + { + int numDarkCells = 0; + var array = matrix.Array; + int width = matrix.Width; + int height = matrix.Height; + for (int y = 0; y < height; y++) + { + var arrayY = array[y]; + for (int x = 0; x < width; x++) + { + if (arrayY[x] == 1) + { + numDarkCells++; + } + } + } + var numTotalCells = matrix.Height * matrix.Width; + var darkRatio = (double)numDarkCells / numTotalCells; + var fivePercentVariances = (int)(Math.Abs(darkRatio - 0.5) * 20.0); // * 100.0 / 5.0 + return fivePercentVariances * N4; + } + + /// + /// Return the mask bit for "getMaskPattern" at "x" and "y". See 8.8 of JISX0510:2004 for mask + /// pattern conditions. + /// + /// The mask pattern. + /// The x. + /// The y. + /// + public static bool getDataMaskBit(int maskPattern, int x, int y) + { + int intermediate, temp; + switch (maskPattern) + { + + case 0: + intermediate = (y + x) & 0x1; + break; + + case 1: + intermediate = y & 0x1; + break; + + case 2: + intermediate = x % 3; + break; + + case 3: + intermediate = (y + x) % 3; + break; + + case 4: + intermediate = (((int)((uint)y >> 1)) + (x / 3)) & 0x1; + break; + + case 5: + temp = y * x; + intermediate = (temp & 0x1) + (temp % 3); + break; + + case 6: + temp = y * x; + intermediate = (((temp & 0x1) + (temp % 3)) & 0x1); + break; + + case 7: + temp = y * x; + intermediate = (((temp % 3) + ((y + x) & 0x1)) & 0x1); + break; + + default: + throw new ArgumentException("Invalid mask pattern: " + maskPattern); + + } + return intermediate == 0; + } + + /// + /// Helper function for applyMaskPenaltyRule1. We need this for doing this calculation in both + /// vertical and horizontal orders respectively. + /// + /// The matrix. + /// if set to true [is horizontal]. + /// + private static int applyMaskPenaltyRule1Internal(ByteMatrix matrix, bool isHorizontal) + { + int penalty = 0; + int iLimit = isHorizontal ? matrix.Height : matrix.Width; + int jLimit = isHorizontal ? matrix.Width : matrix.Height; + var array = matrix.Array; + for (int i = 0; i < iLimit; i++) + { + int numSameBitCells = 0; + int prevBit = -1; + for (int j = 0; j < jLimit; j++) + { + int bit = isHorizontal ? array[i][j] : array[j][i]; + if (bit == prevBit) + { + numSameBitCells++; + } + else + { + if (numSameBitCells >= 5) + { + penalty += N1 + (numSameBitCells - 5); + } + numSameBitCells = 1; // Include the cell itself. + prevBit = bit; + } + } + if (numSameBitCells >= 5) + { + penalty += N1 + (numSameBitCells - 5); + } + } + return penalty; + } + } +} \ No newline at end of file diff --git a/shadowsocks-csharp/3rd/zxing/MatrixUtil.cs b/shadowsocks-csharp/3rd/zxing/MatrixUtil.cs new file mode 100755 index 00000000..ffd9c7b4 --- /dev/null +++ b/shadowsocks-csharp/3rd/zxing/MatrixUtil.cs @@ -0,0 +1,604 @@ +/* +* Copyright 2008 ZXing authors +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using ZXing.Common; + +namespace ZXing.QrCode.Internal +{ + /// + /// + /// + /// + /// satorux@google.com (Satoru Takabayashi) - creator + /// + public static class MatrixUtil + { + private static readonly int[][] POSITION_DETECTION_PATTERN = new int[][] + { + new int[] { 1, 1, 1, 1, 1, 1, 1 }, + new int[] { 1, 0, 0, 0, 0, 0, 1 }, + new int[] { 1, 0, 1, 1, 1, 0, 1 }, + new int[] { 1, 0, 1, 1, 1, 0, 1 }, + new int[] { 1, 0, 1, 1, 1, 0, 1 }, + new int[] { 1, 0, 0, 0, 0, 0, 1 }, + new int[] { 1, 1, 1, 1, 1, 1, 1 } + }; + + private static readonly int[][] POSITION_ADJUSTMENT_PATTERN = new int[][] + { + new int[] { 1, 1, 1, 1, 1 }, + new int[] { 1, 0, 0, 0, 1 }, + new int[] { 1, 0, 1, 0, 1 }, + new int[] { 1, 0, 0, 0, 1 }, + new int[] { 1, 1, 1, 1, 1 } + }; + + // From Appendix E. Table 1, JIS0510X:2004 (p 71). The table was double-checked by komatsu. + private static readonly int[][] POSITION_ADJUSTMENT_PATTERN_COORDINATE_TABLE = new int[][] + { + new int[] { -1, -1, -1, -1, -1, -1, -1 }, + new int[] { 6, 18, -1, -1, -1, -1, -1 }, + new int[] { 6, 22, -1, -1, -1, -1, -1 }, + new int[] { 6, 26, -1, -1, -1, -1, -1 }, + new int[] { 6, 30, -1, -1, -1, -1, -1 }, + new int[] { 6, 34, -1, -1, -1, -1, -1 }, + new int[] { 6, 22, 38, -1, -1, -1, -1 }, + new int[] { 6, 24, 42, -1, -1, -1, -1 }, + new int[] { 6, 26, 46, -1, -1, -1, -1 }, + new int[] { 6, 28, 50, -1, -1, -1, -1 }, + new int[] { 6, 30, 54, -1, -1, -1, -1 }, + new int[] { 6, 32, 58, -1, -1, -1, -1 }, + new int[] { 6, 34, 62, -1, -1, -1, -1 }, + new int[] { 6, 26, 46, 66, -1, -1, -1 }, + new int[] { 6, 26, 48, 70, -1, -1, -1 }, + new int[] { 6, 26, 50, 74, -1, -1, -1 }, + new int[] { 6, 30, 54, 78, -1, -1, -1 }, + new int[] { 6, 30, 56, 82, -1, -1, -1 }, + new int[] { 6, 30, 58, 86, -1, -1, -1 }, + new int[] { 6, 34, 62, 90, -1, -1, -1 }, + new int[] { 6, 28, 50, 72, 94, -1, -1 }, + new int[] { 6, 26, 50, 74, 98, -1, -1 }, + new int[] { 6, 30, 54, 78, 102, -1, -1 }, + new int[] { 6, 28, 54, 80, 106, -1, -1 }, + new int[] { 6, 32, 58, 84, 110, -1, -1 }, + new int[] { 6, 30, 58, 86, 114, -1, -1 }, + new int[] { 6, 34, 62, 90, 118, -1, -1 }, + new int[] { 6, 26, 50, 74, 98, 122, -1 }, + new int[] { 6, 30, 54, 78, 102, 126, -1 }, + new int[] { 6, 26, 52, 78, 104, 130, -1 }, + new int[] { 6, 30, 56, 82, 108, 134, -1 }, + new int[] { 6, 34, 60, 86, 112, 138, -1 }, + new int[] { 6, 30, 58, 86, 114, 142, -1 }, + new int[] { 6, 34, 62, 90, 118, 146, -1 }, + new int[] { 6, 30, 54, 78, 102, 126, 150 }, + new int[] { 6, 24, 50, 76, 102, 128, 154 }, + new int[] { 6, 28, 54, 80, 106, 132, 158 }, + new int[] { 6, 32, 58, 84, 110, 136, 162 }, + new int[] { 6, 26, 54, 82, 110, 138, 166 }, + new int[] { 6, 30, 58, 86, 114, 142, 170 } + }; + + // Type info cells at the left top corner. + private static readonly int[][] TYPE_INFO_COORDINATES = new int[][] + { + new int[] { 8, 0 }, + new int[] { 8, 1 }, + new int[] { 8, 2 }, + new int[] { 8, 3 }, + new int[] { 8, 4 }, + new int[] { 8, 5 }, + new int[] { 8, 7 }, + new int[] { 8, 8 }, + new int[] { 7, 8 }, + new int[] { 5, 8 }, + new int[] { 4, 8 }, + new int[] { 3, 8 }, + new int[] { 2, 8 }, + new int[] { 1, 8 }, + new int[] { 0, 8 } + }; + + // From Appendix D in JISX0510:2004 (p. 67) + private const int VERSION_INFO_POLY = 0x1f25; // 1 1111 0010 0101 + + // From Appendix C in JISX0510:2004 (p.65). + private const int TYPE_INFO_POLY = 0x537; + private const int TYPE_INFO_MASK_PATTERN = 0x5412; + + /// + /// Set all cells to 2. 2 means that the cell is empty (not set yet). + /// + /// JAVAPORT: We shouldn't need to do this at all. The code should be rewritten to begin encoding + /// with the ByteMatrix initialized all to zero. + /// + /// The matrix. + public static void clearMatrix(ByteMatrix matrix) + { + matrix.clear(2); + } + + /// + /// Build 2D matrix of QR Code from "dataBits" with "ecLevel", "version" and "getMaskPattern". On + /// success, store the result in "matrix" and return true. + /// + /// The data bits. + /// The ec level. + /// The version. + /// The mask pattern. + /// The matrix. + public static void buildMatrix(BitArray dataBits, ErrorCorrectionLevel ecLevel, Version version, int maskPattern, ByteMatrix matrix) + { + clearMatrix(matrix); + embedBasicPatterns(version, matrix); + // Type information appear with any version. + embedTypeInfo(ecLevel, maskPattern, matrix); + // Version info appear if version >= 7. + maybeEmbedVersionInfo(version, matrix); + // Data should be embedded at end. + embedDataBits(dataBits, maskPattern, matrix); + } + + /// + /// Embed basic patterns. On success, modify the matrix and return true. + /// The basic patterns are: + /// - Position detection patterns + /// - Timing patterns + /// - Dark dot at the left bottom corner + /// - Position adjustment patterns, if need be + /// + /// The version. + /// The matrix. + public static void embedBasicPatterns(Version version, ByteMatrix matrix) + { + // Let's get started with embedding big squares at corners. + embedPositionDetectionPatternsAndSeparators(matrix); + // Then, embed the dark dot at the left bottom corner. + embedDarkDotAtLeftBottomCorner(matrix); + + // Position adjustment patterns appear if version >= 2. + maybeEmbedPositionAdjustmentPatterns(version, matrix); + // Timing patterns should be embedded after position adj. patterns. + embedTimingPatterns(matrix); + } + + /// + /// Embed type information. On success, modify the matrix. + /// + /// The ec level. + /// The mask pattern. + /// The matrix. + public static void embedTypeInfo(ErrorCorrectionLevel ecLevel, int maskPattern, ByteMatrix matrix) + { + BitArray typeInfoBits = new BitArray(); + makeTypeInfoBits(ecLevel, maskPattern, typeInfoBits); + + for (int i = 0; i < typeInfoBits.Size; ++i) + { + // Place bits in LSB to MSB order. LSB (least significant bit) is the last value in + // "typeInfoBits". + int bit = typeInfoBits[typeInfoBits.Size - 1 - i] ? 1 : 0; + + // Type info bits at the left top corner. See 8.9 of JISX0510:2004 (p.46). + int x1 = TYPE_INFO_COORDINATES[i][0]; + int y1 = TYPE_INFO_COORDINATES[i][1]; + matrix[x1, y1] = bit; + + if (i < 8) + { + // Right top corner. + int x2 = matrix.Width - i - 1; + int y2 = 8; + matrix[x2, y2] = bit; + } + else + { + // Left bottom corner. + int x2 = 8; + int y2 = matrix.Height - 7 + (i - 8); + matrix[x2, y2] = bit; + } + } + } + + /// + /// Embed version information if need be. On success, modify the matrix and return true. + /// See 8.10 of JISX0510:2004 (p.47) for how to embed version information. + /// + /// The version. + /// The matrix. + public static void maybeEmbedVersionInfo(Version version, ByteMatrix matrix) + { + if (version.VersionNumber < 7) + { + // Version info is necessary if version >= 7. + return; // Don't need version info. + } + BitArray versionInfoBits = new BitArray(); + makeVersionInfoBits(version, versionInfoBits); + + int bitIndex = 6 * 3 - 1; // It will decrease from 17 to 0. + for (int i = 0; i < 6; ++i) + { + for (int j = 0; j < 3; ++j) + { + // Place bits in LSB (least significant bit) to MSB order. + var bit = versionInfoBits[bitIndex] ? 1 : 0; + bitIndex--; + // Left bottom corner. + matrix[i, matrix.Height - 11 + j] = bit; + // Right bottom corner. + matrix[matrix.Height - 11 + j, i] = bit; + } + } + } + + /// + /// Embed "dataBits" using "getMaskPattern". On success, modify the matrix and return true. + /// For debugging purposes, it skips masking process if "getMaskPattern" is -1. + /// See 8.7 of JISX0510:2004 (p.38) for how to embed data bits. + /// + /// The data bits. + /// The mask pattern. + /// The matrix. + public static void embedDataBits(BitArray dataBits, int maskPattern, ByteMatrix matrix) + { + int bitIndex = 0; + int direction = -1; + // Start from the right bottom cell. + int x = matrix.Width - 1; + int y = matrix.Height - 1; + while (x > 0) + { + // Skip the vertical timing pattern. + if (x == 6) + { + x -= 1; + } + while (y >= 0 && y < matrix.Height) + { + for (int i = 0; i < 2; ++i) + { + int xx = x - i; + // Skip the cell if it's not empty. + if (!isEmpty(matrix[xx, y])) + { + continue; + } + int bit; + if (bitIndex < dataBits.Size) + { + bit = dataBits[bitIndex] ? 1 : 0; + ++bitIndex; + } + else + { + // Padding bit. If there is no bit left, we'll fill the left cells with 0, as described + // in 8.4.9 of JISX0510:2004 (p. 24). + bit = 0; + } + + // Skip masking if mask_pattern is -1. + if (maskPattern != -1) + { + if (MaskUtil.getDataMaskBit(maskPattern, xx, y)) + { + bit ^= 0x1; + } + } + matrix[xx, y] = bit; + } + y += direction; + } + direction = -direction; // Reverse the direction. + y += direction; + x -= 2; // Move to the left. + } + // All bits should be consumed. + if (bitIndex != dataBits.Size) + { + throw new Exception("Not all bits consumed: " + bitIndex + '/' + dataBits.Size); + } + } + + /// + /// Return the position of the most significant bit set (to one) in the "value". The most + /// significant bit is position 32. If there is no bit set, return 0. Examples: + /// - findMSBSet(0) => 0 + /// - findMSBSet(1) => 1 + /// - findMSBSet(255) => 8 + /// + /// The value_ renamed. + /// + public static int findMSBSet(int value_Renamed) + { + int numDigits = 0; + while (value_Renamed != 0) + { + value_Renamed = (int)((uint)value_Renamed >> 1); + ++numDigits; + } + return numDigits; + } + + /// + /// Calculate BCH (Bose-Chaudhuri-Hocquenghem) code for "value" using polynomial "poly". The BCH + /// code is used for encoding type information and version information. + /// Example: Calculation of version information of 7. + /// f(x) is created from 7. + /// - 7 = 000111 in 6 bits + /// - f(x) = x^2 + x^2 + x^1 + /// g(x) is given by the standard (p. 67) + /// - g(x) = x^12 + x^11 + x^10 + x^9 + x^8 + x^5 + x^2 + 1 + /// Multiply f(x) by x^(18 - 6) + /// - f'(x) = f(x) * x^(18 - 6) + /// - f'(x) = x^14 + x^13 + x^12 + /// Calculate the remainder of f'(x) / g(x) + /// x^2 + /// __________________________________________________ + /// g(x) )x^14 + x^13 + x^12 + /// x^14 + x^13 + x^12 + x^11 + x^10 + x^7 + x^4 + x^2 + /// -------------------------------------------------- + /// x^11 + x^10 + x^7 + x^4 + x^2 + /// + /// The remainder is x^11 + x^10 + x^7 + x^4 + x^2 + /// Encode it in binary: 110010010100 + /// The return value is 0xc94 (1100 1001 0100) + /// + /// Since all coefficients in the polynomials are 1 or 0, we can do the calculation by bit + /// operations. We don't care if cofficients are positive or negative. + /// + /// The value. + /// The poly. + /// + public static int calculateBCHCode(int value, int poly) + { + if (poly == 0) + throw new ArgumentException("0 polynominal", "poly"); + + // If poly is "1 1111 0010 0101" (version info poly), msbSetInPoly is 13. We'll subtract 1 + // from 13 to make it 12. + int msbSetInPoly = findMSBSet(poly); + value <<= msbSetInPoly - 1; + // Do the division business using exclusive-or operations. + while (findMSBSet(value) >= msbSetInPoly) + { + value ^= poly << (findMSBSet(value) - msbSetInPoly); + } + // Now the "value" is the remainder (i.e. the BCH code) + return value; + } + + /// + /// Make bit vector of type information. On success, store the result in "bits" and return true. + /// Encode error correction level and mask pattern. See 8.9 of + /// JISX0510:2004 (p.45) for details. + /// + /// The ec level. + /// The mask pattern. + /// The bits. + public static void makeTypeInfoBits(ErrorCorrectionLevel ecLevel, int maskPattern, BitArray bits) + { + if (!QRCode.isValidMaskPattern(maskPattern)) + { + throw new Exception("Invalid mask pattern"); + } + int typeInfo = (ecLevel.Bits << 3) | maskPattern; + bits.appendBits(typeInfo, 5); + + int bchCode = calculateBCHCode(typeInfo, TYPE_INFO_POLY); + bits.appendBits(bchCode, 10); + + BitArray maskBits = new BitArray(); + maskBits.appendBits(TYPE_INFO_MASK_PATTERN, 15); + bits.xor(maskBits); + + if (bits.Size != 15) + { + // Just in case. + throw new Exception("should not happen but we got: " + bits.Size); + } + } + + /// + /// Make bit vector of version information. On success, store the result in "bits" and return true. + /// See 8.10 of JISX0510:2004 (p.45) for details. + /// + /// The version. + /// The bits. + public static void makeVersionInfoBits(Version version, BitArray bits) + { + bits.appendBits(version.VersionNumber, 6); + int bchCode = calculateBCHCode(version.VersionNumber, VERSION_INFO_POLY); + bits.appendBits(bchCode, 12); + + if (bits.Size != 18) + { + // Just in case. + throw new Exception("should not happen but we got: " + bits.Size); + } + } + + /// + /// Check if "value" is empty. + /// + /// The value. + /// + /// true if the specified value is empty; otherwise, false. + /// + private static bool isEmpty(int value) + { + return value == 2; + } + + private static void embedTimingPatterns(ByteMatrix matrix) + { + // -8 is for skipping position detection patterns (size 7), and two horizontal/vertical + // separation patterns (size 1). Thus, 8 = 7 + 1. + for (int i = 8; i < matrix.Width - 8; ++i) + { + int bit = (i + 1) % 2; + // Horizontal line. + if (isEmpty(matrix[i, 6])) + { + matrix[i, 6] = bit; + } + // Vertical line. + if (isEmpty(matrix[6, i])) + { + matrix[6, i] = bit; + } + } + } + + /// + /// Embed the lonely dark dot at left bottom corner. JISX0510:2004 (p.46) + /// + /// The matrix. + private static void embedDarkDotAtLeftBottomCorner(ByteMatrix matrix) + { + if (matrix[8, matrix.Height - 8] == 0) + { + throw new Exception(); + } + matrix[8, matrix.Height - 8] = 1; + } + + private static void embedHorizontalSeparationPattern(int xStart, int yStart, ByteMatrix matrix) + { + for (int x = 0; x < 8; ++x) + { + if (!isEmpty(matrix[xStart + x, yStart])) + { + throw new Exception(); + } + matrix[xStart + x, yStart] = 0; + } + } + + private static void embedVerticalSeparationPattern(int xStart, int yStart, ByteMatrix matrix) + { + for (int y = 0; y < 7; ++y) + { + if (!isEmpty(matrix[xStart, yStart + y])) + { + throw new Exception(); + } + matrix[xStart, yStart + y] = 0; + } + } + + /// + /// Note that we cannot unify the function with embedPositionDetectionPattern() despite they are + /// almost identical, since we cannot write a function that takes 2D arrays in different sizes in + /// C/C++. We should live with the fact. + /// + /// The x start. + /// The y start. + /// The matrix. + private static void embedPositionAdjustmentPattern(int xStart, int yStart, ByteMatrix matrix) + { + for (int y = 0; y < 5; ++y) + { + for (int x = 0; x < 5; ++x) + { + matrix[xStart + x, yStart + y] = POSITION_ADJUSTMENT_PATTERN[y][x]; + } + } + } + + private static void embedPositionDetectionPattern(int xStart, int yStart, ByteMatrix matrix) + { + for (int y = 0; y < 7; ++y) + { + for (int x = 0; x < 7; ++x) + { + matrix[xStart + x, yStart + y] = POSITION_DETECTION_PATTERN[y][x]; + } + } + } + + /// + /// Embed position detection patterns and surrounding vertical/horizontal separators. + /// + /// The matrix. + private static void embedPositionDetectionPatternsAndSeparators(ByteMatrix matrix) + { + // Embed three big squares at corners. + int pdpWidth = POSITION_DETECTION_PATTERN[0].Length; + // Left top corner. + embedPositionDetectionPattern(0, 0, matrix); + // Right top corner. + embedPositionDetectionPattern(matrix.Width - pdpWidth, 0, matrix); + // Left bottom corner. + embedPositionDetectionPattern(0, matrix.Width - pdpWidth, matrix); + + // Embed horizontal separation patterns around the squares. + const int hspWidth = 8; + // Left top corner. + embedHorizontalSeparationPattern(0, hspWidth - 1, matrix); + // Right top corner. + embedHorizontalSeparationPattern(matrix.Width - hspWidth, hspWidth - 1, matrix); + // Left bottom corner. + embedHorizontalSeparationPattern(0, matrix.Width - hspWidth, matrix); + + // Embed vertical separation patterns around the squares. + const int vspSize = 7; + // Left top corner. + embedVerticalSeparationPattern(vspSize, 0, matrix); + // Right top corner. + embedVerticalSeparationPattern(matrix.Height - vspSize - 1, 0, matrix); + // Left bottom corner. + embedVerticalSeparationPattern(vspSize, matrix.Height - vspSize, matrix); + } + + /// + /// Embed position adjustment patterns if need be. + /// + /// The version. + /// The matrix. + private static void maybeEmbedPositionAdjustmentPatterns(Version version, ByteMatrix matrix) + { + if (version.VersionNumber < 2) + { + // The patterns appear if version >= 2 + return; + } + int index = version.VersionNumber - 1; + int[] coordinates = POSITION_ADJUSTMENT_PATTERN_COORDINATE_TABLE[index]; + int numCoordinates = POSITION_ADJUSTMENT_PATTERN_COORDINATE_TABLE[index].Length; + for (int i = 0; i < numCoordinates; ++i) + { + for (int j = 0; j < numCoordinates; ++j) + { + int y = coordinates[i]; + int x = coordinates[j]; + if (x == -1 || y == -1) + { + continue; + } + // If the cell is unset, we embed the position adjustment pattern here. + if (isEmpty(matrix[x, y])) + { + // -2 is necessary since the x/y coordinates point to the center of the pattern, not the + // left top corner. + embedPositionAdjustmentPattern(x - 2, y - 2, matrix); + } + } + } + } + } +} \ No newline at end of file diff --git a/shadowsocks-csharp/3rd/zxing/Mode.cs b/shadowsocks-csharp/3rd/zxing/Mode.cs new file mode 100755 index 00000000..df1a5ebb --- /dev/null +++ b/shadowsocks-csharp/3rd/zxing/Mode.cs @@ -0,0 +1,115 @@ +/* +* Copyright 2007 ZXing authors +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; + +namespace ZXing.QrCode.Internal +{ + /// + ///

See ISO 18004:2006, 6.4.1, Tables 2 and 3. This enum encapsulates the various modes in which + /// data can be encoded to bits in the QR code standard.

+ /// + /// Sean Owen + public sealed class Mode + { + /// + /// Gets the name. + /// + public String Name + { + get + { + return name; + } + } + + // No, we can't use an enum here. J2ME doesn't support it. + + /// + /// + /// + public static readonly Mode BYTE = new Mode(new int[] { 8, 16, 16 }, 0x04, "BYTE"); + + private readonly int[] characterCountBitsForVersions; + private readonly int bits; + private readonly String name; + + private Mode(int[] characterCountBitsForVersions, int bits, System.String name) + { + this.characterCountBitsForVersions = characterCountBitsForVersions; + this.bits = bits; + this.name = name; + } + + /// + /// Fors the bits. + /// + /// four bits encoding a QR Code data mode + /// + /// encoded by these bits + /// + /// if bits do not correspond to a known mode + public static Mode forBits(int bits) + { + switch (bits) + { + case 0x4: + return BYTE; + default: + throw new ArgumentException(); + } + } + + /// version in question + /// + /// number of bits used, in this QR Code symbol {@link Version}, to encode the + /// count of characters that will follow encoded in this {@link Mode} + /// + public int getCharacterCountBits(Version version) + { + if (characterCountBitsForVersions == null) + { + throw new ArgumentException("Character count doesn't apply to this mode"); + } + int number = version.VersionNumber; + int offset; + if (number <= 9) + { + offset = 0; + } + else if (number <= 26) + { + offset = 1; + } + else + { + offset = 2; + } + return characterCountBitsForVersions[offset]; + } + + /// + /// Gets the bits. + /// + public int Bits + { + get + { + return bits; + } + } + } +} \ No newline at end of file diff --git a/shadowsocks-csharp/3rd/zxing/QRCode.cs b/shadowsocks-csharp/3rd/zxing/QRCode.cs new file mode 100755 index 00000000..123d4f18 --- /dev/null +++ b/shadowsocks-csharp/3rd/zxing/QRCode.cs @@ -0,0 +1,91 @@ +/* +* Copyright 2008 ZXing authors +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Text; + +namespace ZXing.QrCode.Internal +{ + /// satorux@google.com (Satoru Takabayashi) - creator + /// dswitkin@google.com (Daniel Switkin) - ported from C++ + public class QRCode + { + /// + /// + /// + public static int NUM_MASK_PATTERNS = 8; + + /// + /// Initializes a new instance of the class. + /// + public QRCode() + { + MaskPattern = -1; + } + + /// + /// Gets or sets the mode. + /// + /// + /// The mode. + /// + public Mode Mode { get; set; } + + /// + /// Gets or sets the EC level. + /// + /// + /// The EC level. + /// + public ErrorCorrectionLevel ECLevel { get; set; } + + /// + /// Gets or sets the version. + /// + /// + /// The version. + /// + public Version Version { get; set; } + + /// + /// Gets or sets the mask pattern. + /// + /// + /// The mask pattern. + /// + public int MaskPattern { get; set; } + + /// + /// Gets or sets the matrix. + /// + /// + /// The matrix. + /// + public ByteMatrix Matrix { get; set; } + + /// + /// Check if "mask_pattern" is valid. + /// + /// The mask pattern. + /// + /// true if [is valid mask pattern] [the specified mask pattern]; otherwise, false. + /// + public static bool isValidMaskPattern(int maskPattern) + { + return maskPattern >= 0 && maskPattern < NUM_MASK_PATTERNS; + } + } +} \ No newline at end of file diff --git a/shadowsocks-csharp/3rd/zxing/ReedSolomonEncoder.cs b/shadowsocks-csharp/3rd/zxing/ReedSolomonEncoder.cs new file mode 100755 index 00000000..78aca71d --- /dev/null +++ b/shadowsocks-csharp/3rd/zxing/ReedSolomonEncoder.cs @@ -0,0 +1,84 @@ +/* +* Copyright 2008 ZXing authors +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections.Generic; + +namespace ZXing.Common.ReedSolomon +{ + /// + /// Implements Reed-Solomon encoding, as the name implies. + /// + /// Sean Owen + /// William Rucklidge + public sealed class ReedSolomonEncoder + { + private readonly GenericGF field; + private readonly IList cachedGenerators; + + public ReedSolomonEncoder(GenericGF field) + { + this.field = field; + this.cachedGenerators = new List(); + cachedGenerators.Add(new GenericGFPoly(field, new int[] { 1 })); + } + + private GenericGFPoly buildGenerator(int degree) + { + if (degree >= cachedGenerators.Count) + { + var lastGenerator = cachedGenerators[cachedGenerators.Count - 1]; + for (int d = cachedGenerators.Count; d <= degree; d++) + { + var nextGenerator = lastGenerator.multiply(new GenericGFPoly(field, new int[] { 1, field.exp(d - 1 + field.GeneratorBase) })); + cachedGenerators.Add(nextGenerator); + lastGenerator = nextGenerator; + } + } + return cachedGenerators[degree]; + } + + public void encode(int[] toEncode, int ecBytes) + { + if (ecBytes == 0) + { + throw new ArgumentException("No error correction bytes"); + } + var dataBytes = toEncode.Length - ecBytes; + if (dataBytes <= 0) + { + throw new ArgumentException("No data bytes provided"); + } + + var generator = buildGenerator(ecBytes); + var infoCoefficients = new int[dataBytes]; + Array.Copy(toEncode, 0, infoCoefficients, 0, dataBytes); + + var info = new GenericGFPoly(field, infoCoefficients); + info = info.multiplyByMonomial(ecBytes, 1); + + var remainder = info.divide(generator)[1]; + var coefficients = remainder.Coefficients; + var numZeroCoefficients = ecBytes - coefficients.Length; + for (var i = 0; i < numZeroCoefficients; i++) + { + toEncode[dataBytes + i] = 0; + } + + Array.Copy(coefficients, 0, toEncode, dataBytes + numZeroCoefficients, coefficients.Length); + } + } +} \ No newline at end of file diff --git a/shadowsocks-csharp/3rd/zxing/Version.cs b/shadowsocks-csharp/3rd/zxing/Version.cs new file mode 100755 index 00000000..be531ca4 --- /dev/null +++ b/shadowsocks-csharp/3rd/zxing/Version.cs @@ -0,0 +1,342 @@ +/* +* Copyright 2007 ZXing authors +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; + +using ZXing.Common; + +namespace ZXing.QrCode.Internal +{ + /// + /// See ISO 18004:2006 Annex D + /// + /// Sean Owen + public sealed class Version + { + + private static readonly Version[] VERSIONS = buildVersions(); + + private readonly int versionNumber; + private readonly int[] alignmentPatternCenters; + private readonly ECBlocks[] ecBlocks; + private readonly int totalCodewords; + + private Version(int versionNumber, int[] alignmentPatternCenters, params ECBlocks[] ecBlocks) + { + this.versionNumber = versionNumber; + this.alignmentPatternCenters = alignmentPatternCenters; + this.ecBlocks = ecBlocks; + int total = 0; + int ecCodewords = ecBlocks[0].ECCodewordsPerBlock; + ECB[] ecbArray = ecBlocks[0].getECBlocks(); + foreach (var ecBlock in ecbArray) + { + total += ecBlock.Count * (ecBlock.DataCodewords + ecCodewords); + } + this.totalCodewords = total; + } + + /// + /// Gets the version number. + /// + public int VersionNumber + { + get + { + return versionNumber; + } + + } + + /// + /// Gets the total codewords. + /// + public int TotalCodewords + { + get + { + return totalCodewords; + } + + } + + /// + /// Gets the dimension for version. + /// + public int DimensionForVersion + { + get + { + return 17 + 4 * versionNumber; + } + + } + + /// + /// Gets the EC blocks for level. + /// + /// The ec level. + /// + public ECBlocks getECBlocksForLevel(ErrorCorrectionLevel ecLevel) + { + return ecBlocks[ecLevel.ordinal()]; + } + + /// + /// Gets the version for number. + /// + /// The version number. + /// + public static Version getVersionForNumber(int versionNumber) + { + if (versionNumber < 1 || versionNumber > 40) + { + throw new ArgumentException(); + } + return VERSIONS[versionNumber - 1]; + } + + + ///

Encapsulates a set of error-correction blocks in one symbol version. Most versions will + /// use blocks of differing sizes within one version, so, this encapsulates the parameters for + /// each set of blocks. It also holds the number of error-correction codewords per block since it + /// will be the same across all blocks within one version.

+ /// + public sealed class ECBlocks + { + private readonly int ecCodewordsPerBlock; + private readonly ECB[] ecBlocks; + + internal ECBlocks(int ecCodewordsPerBlock, params ECB[] ecBlocks) + { + this.ecCodewordsPerBlock = ecCodewordsPerBlock; + this.ecBlocks = ecBlocks; + } + + /// + /// Gets the EC codewords per block. + /// + public int ECCodewordsPerBlock + { + get + { + return ecCodewordsPerBlock; + } + } + + /// + /// Gets the num blocks. + /// + public int NumBlocks + { + get + { + int total = 0; + foreach (var ecBlock in ecBlocks) + { + total += ecBlock.Count; + } + return total; + } + } + + /// + /// Gets the total EC codewords. + /// + public int TotalECCodewords + { + get + { + return ecCodewordsPerBlock * NumBlocks; + } + } + + /// + /// Gets the EC blocks. + /// + /// + public ECB[] getECBlocks() + { + return ecBlocks; + } + } + + ///

Encapsualtes the parameters for one error-correction block in one symbol version. + /// This includes the number of data codewords, and the number of times a block with these + /// parameters is used consecutively in the QR code version's format.

+ /// + public sealed class ECB + { + private readonly int count; + private readonly int dataCodewords; + + internal ECB(int count, int dataCodewords) + { + this.count = count; + this.dataCodewords = dataCodewords; + } + + /// + /// Gets the count. + /// + public int Count + { + get + { + return count; + } + + } + /// + /// Gets the data codewords. + /// + public int DataCodewords + { + get + { + return dataCodewords; + } + + } + } + + /// + /// Returns a that represents this instance. + /// + /// + /// A that represents this instance. + /// + public override String ToString() + { + return Convert.ToString(versionNumber); + } + + /// See ISO 18004:2006 6.5.1 Table 9 + private static Version[] buildVersions() + { + return new Version[] + { + new Version(1, new int[] {}, + new ECBlocks(7, new ECB(1, 19)), + new ECBlocks(10, new ECB(1, 16)), + new ECBlocks(13, new ECB(1, 13)), + new ECBlocks(17, new ECB(1, 9))), + new Version(2, new int[] {6, 18}, + new ECBlocks(10, new ECB(1, 34)), + new ECBlocks(16, new ECB(1, 28)), + new ECBlocks(22, new ECB(1, 22)), + new ECBlocks(28, new ECB(1, 16))), + new Version(3, new int[] {6, 22}, + new ECBlocks(15, new ECB(1, 55)), + new ECBlocks(26, new ECB(1, 44)), + new ECBlocks(18, new ECB(2, 17)), + new ECBlocks(22, new ECB(2, 13))), + new Version(4, new int[] {6, 26}, + new ECBlocks(20, new ECB(1, 80)), + new ECBlocks(18, new ECB(2, 32)), + new ECBlocks(26, new ECB(2, 24)), + new ECBlocks(16, new ECB(4, 9))), + new Version(5, new int[] {6, 30}, + new ECBlocks(26, new ECB(1, 108)), + new ECBlocks(24, new ECB(2, 43)), + new ECBlocks(18, new ECB(2, 15), + new ECB(2, 16)), + new ECBlocks(22, new ECB(2, 11), + new ECB(2, 12))), + new Version(6, new int[] {6, 34}, + new ECBlocks(18, new ECB(2, 68)), + new ECBlocks(16, new ECB(4, 27)), + new ECBlocks(24, new ECB(4, 19)), + new ECBlocks(28, new ECB(4, 15))), + new Version(7, new int[] {6, 22, 38}, + new ECBlocks(20, new ECB(2, 78)), + new ECBlocks(18, new ECB(4, 31)), + new ECBlocks(18, new ECB(2, 14), + new ECB(4, 15)), + new ECBlocks(26, new ECB(4, 13), + new ECB(1, 14))), + new Version(8, new int[] {6, 24, 42}, + new ECBlocks(24, new ECB(2, 97)), + new ECBlocks(22, new ECB(2, 38), + new ECB(2, 39)), + new ECBlocks(22, new ECB(4, 18), + new ECB(2, 19)), + new ECBlocks(26, new ECB(4, 14), + new ECB(2, 15))), + new Version(9, new int[] {6, 26, 46}, + new ECBlocks(30, new ECB(2, 116)), + new ECBlocks(22, new ECB(3, 36), + new ECB(2, 37)), + new ECBlocks(20, new ECB(4, 16), + new ECB(4, 17)), + new ECBlocks(24, new ECB(4, 12), + new ECB(4, 13))), + new Version(10, new int[] {6, 28, 50}, + new ECBlocks(18, new ECB(2, 68), + new ECB(2, 69)), + new ECBlocks(26, new ECB(4, 43), + new ECB(1, 44)), + new ECBlocks(24, new ECB(6, 19), + new ECB(2, 20)), + new ECBlocks(28, new ECB(6, 15), + new ECB(2, 16))), + new Version(11, new int[] {6, 30, 54}, + new ECBlocks(20, new ECB(4, 81)), + new ECBlocks(30, new ECB(1, 50), + new ECB(4, 51)), + new ECBlocks(28, new ECB(4, 22), + new ECB(4, 23)), + new ECBlocks(24, new ECB(3, 12), + new ECB(8, 13))), + new Version(12, new int[] {6, 32, 58}, + new ECBlocks(24, new ECB(2, 92), + new ECB(2, 93)), + new ECBlocks(22, new ECB(6, 36), + new ECB(2, 37)), + new ECBlocks(26, new ECB(4, 20), + new ECB(6, 21)), + new ECBlocks(28, new ECB(7, 14), + new ECB(4, 15))), + new Version(13, new int[] {6, 34, 62}, + new ECBlocks(26, new ECB(4, 107)), + new ECBlocks(22, new ECB(8, 37), + new ECB(1, 38)), + new ECBlocks(24, new ECB(8, 20), + new ECB(4, 21)), + new ECBlocks(22, new ECB(12, 11), + new ECB(4, 12))), + new Version(14, new int[] {6, 26, 46, 66}, + new ECBlocks(30, new ECB(3, 115), + new ECB(1, 116)), + new ECBlocks(24, new ECB(4, 40), + new ECB(5, 41)), + new ECBlocks(20, new ECB(11, 16), + new ECB(5, 17)), + new ECBlocks(24, new ECB(11, 12), + new ECB(5, 13))), + new Version(15, new int[] {6, 26, 48, 70}, + new ECBlocks(22, new ECB(5, 87), + new ECB(1, 88)), + new ECBlocks(24, new ECB(5, 41), + new ECB(5, 42)), + new ECBlocks(30, new ECB(5, 24), + new ECB(7, 25)), + new ECBlocks(24, new ECB(11, 12), + new ECB(7, 13))) + }; + } + } +} \ No newline at end of file diff --git a/shadowsocks-csharp/Controller/UpdateChecker.cs b/shadowsocks-csharp/Controller/UpdateChecker.cs index ebf6e3b1..a7683318 100755 --- a/shadowsocks-csharp/Controller/UpdateChecker.cs +++ b/shadowsocks-csharp/Controller/UpdateChecker.cs @@ -17,7 +17,7 @@ namespace Shadowsocks.Controller public string LatestVersionURL; public event EventHandler NewVersionFound; - public const string Version = "2.1.4"; + public const string Version = "2.1.5"; public void CheckUpdate() { diff --git a/shadowsocks-csharp/Data/cn.txt b/shadowsocks-csharp/Data/cn.txt index e845cb3f..63e95167 100644 --- a/shadowsocks-csharp/Data/cn.txt +++ b/shadowsocks-csharp/Data/cn.txt @@ -1,45 +1,45 @@ -Shadowsocks=Shadowsocks -Enable=启用代理 -Mode=代理模式 -PAC=PAC 模式 -Global=全局模式 -Servers=服务器选择 +Shadowsocks=Shadowsocks +Enable=启用代理 +Mode=代理模式 +PAC=PAC 模式 +Global=全局模式 +Servers=服务器选择 Edit Servers...=编辑Shadowsocks服务器... -Start on Boot=自动启动 -Share over LAN=在局域网共享代理 -Edit PAC File...=编辑 PAC 文件... -Show QRCode...=显示二维码... -Show Logs...=显示日志... -About...=关于... -Quit=退出 -Edit Servers=编辑Shadowsocks服务器 -&Add=添加(&A) -&Delete=删除(&D) -Server=服务器 -Server IP=服务器 IP -Server Port=服务器端口 -Password=密码 -Encryption=加密 -Proxy Port=代理端口 -Remarks=备注 -OK=确定 -Cancel=取消 -New server=未配置的服务器 -QRCode=二维码 -Shadowsocks Error: {0}=Shadowsocks 错误: {0} -Port already in use=端口已被占用 -Illegal port number format=非法端口格式 -Please add at least one server=请添加至少一个服务器 -Server IP can not be blank=服务器 IP 不能为空 -Password can not be blank=密码不能为空 -Port out of range=端口超出范围 -Shadowsocks {0} Update Found=Shadowsocks {0} 更新 -Click here to download=点击这里下载 -Shadowsocks is here=Shadowsocks 在这里 -You can turn on/off Shadowsocks in the context menu=可以在右键菜单中开关 Shadowsocks -Enabled=已启用代理 -Disabled=已禁用代理 +Start on Boot=开机启动 +Share over LAN=在局域网共享代理 +Edit PAC File...=编辑 PAC 文件... +Show QRCode...=显示二维码... +Show Logs...=显示日志... +About...=关于... +Quit=退出 +Edit Servers=编辑Shadowsocks服务器 +&Add=添加(&A) +&Delete=删除(&D) +Server=服务器 +Server IP=服务器 IP +Server Port=服务器端口 +Password=密码 +Encryption=加密 +Proxy Port=代理端口 +Remarks=备注 +OK=确定 +Cancel=取消 +New server=未配置的服务器 +QRCode=二维码 +Shadowsocks Error: {0}=Shadowsocks 错误: {0} +Port already in use=端口已被占用 +Illegal port number format=非法端口格式 +Please add at least one server=请添加至少一个服务器 +Server IP can not be blank=服务器 IP 不能为空 +Password can not be blank=密码不能为空 +Port out of range=端口超出范围 +Shadowsocks {0} Update Found=Shadowsocks {0} 更新 +Click here to download=点击这里下载 +Shadowsocks is here=Shadowsocks 在这里 +You can turn on/off Shadowsocks in the context menu=可以在右键菜单中开关 Shadowsocks +Enabled=已启用代理 +Disabled=已禁用代理 &Parse=解析(&P) Shadowsocks URI=Shadowsocks URI -Shadowsocks URI Parse=Shadowsocks URI解析 -URI Parse=URI解析 +Shadowsocks URI Parse=Shadowsocks URI解析 +URI Parse=URI解析 diff --git a/shadowsocks-csharp/View/MenuViewController.cs b/shadowsocks-csharp/View/MenuViewController.cs index 2bcf4cd4..2ff0e763 100755 --- a/shadowsocks-csharp/View/MenuViewController.cs +++ b/shadowsocks-csharp/View/MenuViewController.cs @@ -59,7 +59,7 @@ namespace Shadowsocks.View UpdateTrayIcon(); _notifyIcon.Visible = true; _notifyIcon.ContextMenu = contextMenu1; - _notifyIcon.DoubleClick += notifyIcon1_DoubleClick; + _notifyIcon.MouseDoubleClick += notifyIcon1_DoubleClick; this.updateChecker = new UpdateChecker(); updateChecker.NewVersionFound += updateChecker_NewVersionFound; @@ -393,9 +393,12 @@ namespace Shadowsocks.View Process.Start("https://github.com/clowwindy/shadowsocks-csharp"); } - private void notifyIcon1_DoubleClick(object sender, EventArgs e) + private void notifyIcon1_DoubleClick(object sender, MouseEventArgs e) { - ShowConfigForm(); + if (e.Button == MouseButtons.Left) + { + ShowConfigForm(); + } } private void EnableItem_Click(object sender, EventArgs e) diff --git a/shadowsocks-csharp/View/QRCodeForm.cs b/shadowsocks-csharp/View/QRCodeForm.cs index 3cde5f63..21ea3ab5 100755 --- a/shadowsocks-csharp/View/QRCodeForm.cs +++ b/shadowsocks-csharp/View/QRCodeForm.cs @@ -1,4 +1,4 @@ -using QRCode4CS; +using ZXing.QrCode.Internal; using Shadowsocks.Controller; using Shadowsocks.Properties; using System; @@ -28,48 +28,20 @@ namespace Shadowsocks.View private void GenQR(string ssconfig) { string qrText = ssconfig; - QRCode4CS.Options options = new QRCode4CS.Options(); - options.Text = qrText; - QRCode4CS.QRCode qrCoded = null; - bool success = false; - foreach (var level in new QRErrorCorrectLevel[]{QRErrorCorrectLevel.H, QRErrorCorrectLevel.Q, QRErrorCorrectLevel.M, QRErrorCorrectLevel.L}) - { - for (int i = 3; i < 10; i++) - { - try - { - options.TypeNumber = i; - options.CorrectLevel = level; - qrCoded = new QRCode4CS.QRCode(options); - qrCoded.Make(); - success = true; - break; - } - catch - { - qrCoded = null; - continue; - } - } - if (success) - break; - } - if (qrCoded == null) - { - return; - } - int blockSize = Math.Max(200 / qrCoded.GetModuleCount(), 1); - Bitmap drawArea = new Bitmap((qrCoded.GetModuleCount() * blockSize), (qrCoded.GetModuleCount() * blockSize)); + QRCode code = ZXing.QrCode.Internal.Encoder.encode(qrText, ErrorCorrectionLevel.M); + ByteMatrix m = code.Matrix; + int blockSize = Math.Max(200 / m.Height, 1); + Bitmap drawArea = new Bitmap((m.Width * blockSize), (m.Height * blockSize)); using (Graphics g = Graphics.FromImage(drawArea)) { g.Clear(Color.White); using (Brush b = new SolidBrush(Color.Black)) { - for (int row = 0; row < qrCoded.GetModuleCount(); row++) + for (int row = 0; row < m.Width; row++) { - for (int col = 0; col < qrCoded.GetModuleCount(); col++) + for (int col = 0; col < m.Height; col++) { - if (qrCoded.IsDark(row, col)) + if (m[row, col] != 0) { g.FillRectangle(b, blockSize * row, blockSize * col, blockSize, blockSize); } diff --git a/shadowsocks-csharp/shadowsocks-csharp.csproj b/shadowsocks-csharp/shadowsocks-csharp.csproj index 71369aa6..1c0647b8 100755 --- a/shadowsocks-csharp/shadowsocks-csharp.csproj +++ b/shadowsocks-csharp/shadowsocks-csharp.csproj @@ -57,6 +57,7 @@ prompt ManagedMinimumRules.ruleset false + true app.manifest @@ -69,8 +70,20 @@ - + + + + + + + + + + + + +