diff --git a/src/include/util.h b/src/include/util.h index a465d3a..2ad069c 100644 --- a/src/include/util.h +++ b/src/include/util.h @@ -2,6 +2,10 @@ #ifndef __UTIL_H__ #define __UTIL_H__ +#ifdef min + #undef min +#endif + namespace easypr { class Utils { @@ -19,6 +23,14 @@ namespace easypr { */ static std::vector splitString(const std::string &str, const char delimiter); + /* + * returns the smaller of the two numbers + */ + template + static T min(const T &v1, const T &v2) { + return (v1 < v2) ? v1 : v2; + } + }; } @@ -38,7 +50,7 @@ unsigned int levenshtein_distance(const T &s1, const T & s2) { for (unsigned int i = 0; i < len1; i++) { col[0] = i+1; for (unsigned int j = 0; j < len2; j++) - col[j+1] = std::min(std::min(prevCol[1 + j] + 1, col[j] + 1), \ + col[j+1] = easypr::Utils::min(easypr::Utils::min(prevCol[1 + j] + 1, col[j] + 1), \ prevCol[j] + (s1[i]==s2[j] ? 0 : 1) ); col.swap(prevCol); }