From 4884c911fbead4d8bd2d789fd9210125e6bc7baf Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Tue, 2 Aug 2011 11:39:31 +0000 Subject: [PATCH] fixed compile warnings in FLANN about too long integer constants --- modules/flann/include/opencv2/flann/dist.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/flann/include/opencv2/flann/dist.h b/modules/flann/include/opencv2/flann/dist.h index 61e0c6f31e..094fd3435c 100644 --- a/modules/flann/include/opencv2/flann/dist.h +++ b/modules/flann/include/opencv2/flann/dist.h @@ -552,12 +552,14 @@ struct Hamming2 return (((n + (n >> 4))& 0xF0F0F0F)* 0x1010101) >> 24; } +#ifdef FLANN_PLATFORM_64_BIT unsigned int popcnt64(uint64_t n) const { n -= ((n >> 1) & 0x5555555555555555); n = (n & 0x3333333333333333) + ((n >> 2) & 0x3333333333333333); return (((n + (n >> 4))& 0x0f0f0f0f0f0f0f0f)* 0x0101010101010101) >> 56; } +#endif template ResultType operator()(Iterator1 a, Iterator2 b, size_t size, ResultType /*worst_dist*/ = -1) const