fix overflow on 32 bit systems

Author: maxbachmann

CHANGELOG.md

@@ -1,6 +1,10 @@
 ## Changelog
 
-## [3.1.0] - 2024-10-24
+## [3.1.1] - 2024-10-24
+### Fixed
+- Fixed incorrect score calculation for SIMD implementations of Levenshtein and OSA on 32 bit systems
+
+## [3.1.0] - 024-10-24
 ### Changed
 - split `editops_apply`/`opcodes_apply` into `*_apply_str` and `*_apply_vec`. This avoids the instantiation of
   std::basic_string for unsupported types.

extras/rapidfuzz_amalgamated.hpp

@@ -1,7 +1,7 @@
 //  Licensed under the MIT License <http://opensource.org/licenses/MIT>.
 //  SPDX-License-Identifier: MIT
 //  RapidFuzz v1.0.2
-//  Generated: 2024-10-24 12:06:59.588890
+//  Generated: 2024-10-24 14:07:33.184436
 //  ----------------------------------------------------------
 //  This file is an amalgamation of multiple different files.
 //  You probably shouldn't edit it directly.
@@ -7027,7 +7027,7 @@ void levenshtein_hyrroe2003_simd(Range<size_t*> scores, const detail::BlockPatte
             }
             /* calculate score under consideration of wraparounds in parallel counter */
             else {
-                if constexpr (!std::is_same_v<VecType, uint64_t>) {
+                if constexpr (std::numeric_limits<VecType>::max() < std::numeric_limits<size_t>::max()) {
                     size_t min_dist = abs_diff(s1_lengths[result_index], s2.size());
                     size_t wraparound_score = static_cast<size_t>(std::numeric_limits<VecType>::max()) + 1;
 
@@ -8512,7 +8512,7 @@ void osa_hyrroe2003_simd(Range<size_t*> scores, const detail::BlockPatternMatchV
             }
             /* calculate score under consideration of wraparounds in parallel counter */
             else {
-                if constexpr (!std::is_same_v<VecType, uint64_t>) {
+                if constexpr (std::numeric_limits<VecType>::max() < std::numeric_limits<size_t>::max()) {
                     size_t min_dist = abs_diff(s1_lengths[result_index], s2.size());
                     size_t wraparound_score = static_cast<size_t>(std::numeric_limits<VecType>::max()) + 1;
 

rapidfuzz/distance/Levenshtein_impl.hpp

@@ -363,7 +363,7 @@ void levenshtein_hyrroe2003_simd(Range<size_t*> scores, const detail::BlockPatte
             }
             /* calculate score under consideration of wraparounds in parallel counter */
             else {
-                if constexpr (!std::is_same_v<VecType, uint64_t>) {
+                if constexpr (std::numeric_limits<VecType>::max() < std::numeric_limits<size_t>::max()) {
                     size_t min_dist = abs_diff(s1_lengths[result_index], s2.size());
                     size_t wraparound_score = static_cast<size_t>(std::numeric_limits<VecType>::max()) + 1;
 

rapidfuzz/distance/OSA_impl.hpp

@@ -151,7 +151,7 @@ void osa_hyrroe2003_simd(Range<size_t*> scores, const detail::BlockPatternMatchV
             }
             /* calculate score under consideration of wraparounds in parallel counter */
             else {
-                if constexpr (!std::is_same_v<VecType, uint64_t>) {
+                if constexpr (std::numeric_limits<VecType>::max() < std::numeric_limits<size_t>::max()) {
                     size_t min_dist = abs_diff(s1_lengths[result_index], s2.size());
                     size_t wraparound_score = static_cast<size_t>(std::numeric_limits<VecType>::max()) + 1;