X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Futil.cpp;h=47541eefa4ea34cc807f21ca0d9247d18619f2b5;hp=b5095d9e4c1ba5fd8e4bc99b65456a692e1c8c66;hb=d7052a3218b115ab68d24ea33e670ed26afd19ce;hpb=b7941a3c2a1884f1e6f694fda2e90ad20277db2e

diff --git a/src/common/util.cpp b/src/common/util.cpp
index b5095d9e..47541eef 100644
--- a/src/common/util.cpp
+++ b/src/common/util.cpp
@@ -56,7 +56,7 @@ QString decodeString(QByteArray input, QString encoding) {
       cnt--;
       continue;
     }
-    if(!(input[i] & 0x80)) continue; // 7 bit is always ok
+    if((input[i] & 0x80) == 0x00) continue; // 7 bit is always ok
     if((input[i] & 0xf8) == 0xf0) { cnt = 3; continue; }  // 4-byte char 11110xxx 10yyyyyy 10zzzzzz 10vvvvvv
     if((input[i] & 0xf0) == 0xe0) { cnt = 2; continue; }  // 3-byte char 1110xxxx 10yyyyyy 10zzzzzz
     if((input[i] & 0xe0) == 0xc0) { cnt = 1; continue; }  // 2-byte char 110xxxxx 10yyyyyy
@@ -97,3 +97,38 @@ bool readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVariant &item) {
   in >> item;
   return true;
 }
+
+
+uint editingDistance(const QString &s1, const QString &s2) {
+  uint n = s1.size()+1;
+  uint m = s2.size()+1;
+  uint matrix[n][m];
+
+  for(uint i = 0; i < n; i++)
+    matrix[i][0] = i;
+
+  for(uint i = 0; i < m; i++)
+    matrix[0][i] = i;
+
+  uint min;
+  for(uint i = 1; i < n; i++) {
+    for(uint j = 1; j < m; j++) {
+      uint deleteChar = matrix[i-1][j] + 1;
+      uint insertChar = matrix[i][j-1] + 1;
+
+      if(deleteChar < insertChar)
+	min = deleteChar;
+      else
+	min = insertChar;
+      
+      if(s1[i-1] == s2[j-1]) {
+	uint inheritChar = matrix[i-1][j-1];
+	if(inheritChar < min)
+	  min = inheritChar;
+      }
+
+      matrix[i][j] = min;
+    }
+  }
+  return matrix[n-1][m-1];
+}