generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix inconsistent argument type in HammingLUT distance (flann)

Browse Source 
this fixes 64-bit MSVC warning
This commit is contained in:
Andrey Kamaev 2012-10-10 00:31:22 +04:00
parent 044d38a051
commit 56b27bcc7e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/flann/include/opencv2/flann/dist.h
View File

@ -382,7 +382,7 @@ struct HammingLUT
/** this will count the bits in a ^ b /** this will count the bits in a ^ b
*/ */
ResultType operator()(const unsigned char* a, const unsigned char* b, int size) const ResultType operator()(const unsigned char* a, const unsigned char* b, size_t size) const
{ {
static const uchar popCountTable[] = static const uchar popCountTable[] =
{ {
@ -396,7 +396,7 @@ struct HammingLUT
3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, 4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, 4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8
}; };
ResultType result = 0; ResultType result = 0;
for (int i = 0; i < size; i++) { for (size_t i = 0; i < size; i++) {
result += popCountTable[a[i] ^ b[i]]; result += popCountTable[a[i] ^ b[i]];
} }
return result; return result;