Fixed mingw build warnings
This commit is contained in:
@@ -12,6 +12,7 @@
|
||||
* Adapted for FLANN by Marius Muja
|
||||
*/
|
||||
|
||||
#include "defines.h"
|
||||
#include <stdexcept>
|
||||
#include <ostream>
|
||||
#include <typeinfo>
|
||||
@@ -95,6 +96,16 @@ struct big_any_policy : typed_base_any_policy<T>
|
||||
virtual void print(std::ostream& out, void* const* src) { out << *reinterpret_cast<T const*>(*src); }
|
||||
};
|
||||
|
||||
template<> inline void big_any_policy<flann_centers_init_t>::print(std::ostream& out, void* const* src)
|
||||
{
|
||||
out << int(*reinterpret_cast<flann_centers_init_t const*>(*src));
|
||||
}
|
||||
|
||||
template<> inline void big_any_policy<flann_algorithm_t>::print(std::ostream& out, void* const* src)
|
||||
{
|
||||
out << int(*reinterpret_cast<flann_algorithm_t const*>(*src));
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
struct choose_policy
|
||||
{
|
||||
|
@@ -36,7 +36,7 @@ namespace cvflann
|
||||
*/
|
||||
flann_distance_t flann_distance_type_ = FLANN_DIST_L2;
|
||||
flann_distance_t flann_distance_type() { return flann_distance_type_; }
|
||||
|
||||
|
||||
/**
|
||||
* Set distance type to used
|
||||
* \deprecated
|
||||
@@ -52,6 +52,6 @@ namespace cvflann
|
||||
}
|
||||
flann_distance_type_ = distance_type;
|
||||
}
|
||||
|
||||
|
||||
void dummyfunc() {}
|
||||
}
|
@@ -1,7 +1,3 @@
|
||||
#ifdef __GNUC__
|
||||
# pragma GCC diagnostic ignored "-Wsign-promo"
|
||||
#endif
|
||||
|
||||
#ifndef _OPENCV_FLANN_PRECOMP_HPP_
|
||||
#define _OPENCV_FLANN_PRECOMP_HPP_
|
||||
|
||||
|
Reference in New Issue
Block a user