sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix an implementation error of FNV-1a

Browse source
This commit is contained in:
Jean Pierre Cimalando 2020-10-20 23:24:34 +02:00
parent 11fd2f3647
commit 16f34da8bc
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/sfizz/StringViewHelpers.h
View file

@ -56,7 +56,7 @@ constexpr uint64_t Fnv1aPrime = 0x01000193;
*/ */
constexpr uint64_t hash(absl::string_view s, uint64_t h = Fnv1aBasis) constexpr uint64_t hash(absl::string_view s, uint64_t h = Fnv1aBasis)
{ {
return (s.length() == 0) ? h : hash( { s.data() + 1, s.length() - 1 }, (h ^ s.front()) * Fnv1aPrime ); return (s.length() == 0) ? h : hash( { s.data() + 1, s.length() - 1 }, (h ^ static_cast<unsigned char>(s.front())) * Fnv1aPrime );
} }
/** /**
@ -73,7 +73,7 @@ constexpr uint64_t hashNoAmpersand(absl::string_view s, uint64_t h = Fnv1aBasis)
return (s.length() == 0) ? h : ( return (s.length() == 0) ? h : (
(s.front() == '&') (s.front() == '&')
? hashNoAmpersand( { s.data() + 1, s.length() - 1 }, h ) ? hashNoAmpersand( { s.data() + 1, s.length() - 1 }, h )
: hashNoAmpersand( { s.data() + 1, s.length() - 1 }, (h ^ s.front()) * Fnv1aPrime ) : hashNoAmpersand( { s.data() + 1, s.length() - 1 }, (h ^ static_cast<unsigned char>(s.front())) * Fnv1aPrime )
); );
} }