do not use __popcnt64

f1f579f5 · Vadim Pisarevsky · a5f4cdbc · f1f579f5
Commit f1f579f5 authored Sep 18, 2014 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

kyheader.hpp modules/saliency/src/BING/kyheader.hpp +5 -6

No files found.
--- a/modules/saliency/src/BING/kyheader.hpp
+++ b/modules/saliency/src/BING/kyheader.hpp
@@ -149,12 +149,11 @@ inline cv::Rect Vec4i2Rect( cv::Vec4i &v )
 }


- #if defined(_MSC_VER)
- # include <intrin.h>
- # define POPCNT(x) __popcnt(x)
- # define POPCNT64(x) __popcnt64(x)
- #endif
-
+#if defined(_MSC_VER)
+# include <intrin.h>
+# define POPCNT(x) __popcnt(x)
+# define POPCNT64(x) (__popcnt((unsigned)(x)) + __popcnt((unsigned)((uint64_t)(x) >> 32)))
+#endif

 #if defined(__GNUC__)
 # define POPCNT(x) __builtin_popcount(x)