Merge pull request #13270 from 1over:flann_dist_fix

ca5455c5 · Alexander Alekhin · 82f4322d · 5ff76088 · ca5455c5
Commit ca5455c5 authored Nov 25, 2018 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

dist.h modules/flann/include/opencv2/flann/dist.h +1 -2

No files found.
--- a/modules/flann/include/opencv2/flann/dist.h
+++ b/modules/flann/include/opencv2/flann/dist.h
@@ -462,10 +462,9 @@ struct Hamming
            }
        }
 #else // NO NEON and NOT GNUC
-        typedef unsigned long long pop_t;
        HammingLUT lut;
        result = lut(reinterpret_cast<const unsigned char*> (a),
-                     reinterpret_cast<const unsigned char*> (b), size * sizeof(pop_t));
+                     reinterpret_cast<const unsigned char*> (b), size);
 #endif
        return result;
    }