X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fshared%2Fhashtable.pas;h=ec7f54ba85a1b6d86ff9be43b1c63e842fcb7e99;hb=9dca47bd3c931ac2de19aa738124ba843072c2b6;hp=86fd547c4a532d8e4f95fc382b04129e86b40800;hpb=4f4d1ee4bacd4bd6ebfb821de83c591d5bc93981;p=d2df-sdl.git

diff --git a/src/shared/hashtable.pas b/src/shared/hashtable.pas
index 86fd547..ec7f54b 100644
--- a/src/shared/hashtable.pas
+++ b/src/shared/hashtable.pas
@@ -2,8 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -213,6 +212,7 @@ type
 function u32Hash (a: LongWord): LongWord; inline;
 function fnvHash (constref buf; len: LongWord): LongWord;
 function joaatHash (constref buf; len: LongWord; seed: LongWord=0): LongWord;
+function joaatHashPtr (buf: Pointer; len: LongWord; seed: LongWord=0): LongWord;
 
 // has to be public due to FPC generics limitation
 function nextPOTU32 (x: LongWord): LongWord; inline;
@@ -311,6 +311,26 @@ begin
   result := result xor (result shr 11);
   result += (result shl 15);
 end;
+
+function joaatHashPtr (buf: Pointer; len: LongWord; seed: LongWord=0): LongWord;
+var
+  b: PByte;
+  f: LongWord;
+begin
+  result := seed;
+  b := PByte(buf);
+  for f := 1 to len do
+  begin
+    result += b^;
+    result += (result shl 10);
+    result := result xor (result shr 6);
+    Inc(b);
+  end;
+  // finalize
+  result += (result shl 3);
+  result := result xor (result shr 11);
+  result += (result shl 15);
+end;
 {$POP}
 
 {$PUSH}
@@ -417,7 +437,7 @@ begin
 end;
 {$POP}
 
-class function THashKeyStrAnsiCI.hash (const k: AnsiString): LongWord; inline; begin if (Length(k) > 0) then result := fnvHash((@k[1])^, Length(k)) else result := 0; end;
+class function THashKeyStrAnsiCI.hash (const k: AnsiString): LongWord; inline; begin if (Length(k) > 0) then result := fnvHashLo((@k[1])^, Length(k)) else result := 0; end;
 class function THashKeyStrAnsiCI.equ (const a, b: AnsiString): Boolean; inline;
 var
   f: Integer;