Skip to content

O
opencv
Commit 1cf96d36 authored by Andrey Kamaev's avatar Andrey Kamaev
Browse files
Options

Corrected fix of flann deprecation warnings

parent 45077648
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 1 deletion
modules/flann/include/opencv2/flann/flann.hpp
View file @ 1cf96d36
...@@ -225,7 +225,11 @@ int GenericIndex<Distance>::radiusSearch(const Mat& query, Mat& indices, Mat& di ...@@ -225,7 +225,11 @@ int GenericIndex<Distance>::radiusSearch(const Mat& query, Mat& indices, Mat& di
* @deprecated Use GenericIndex class instead * @deprecated Use GenericIndex class instead
*/ */
template <typename T> template <typename T>
class Index_ { class
#ifndef _MSC_VER
FLANN_DEPRECATED
#endif
Index_ {
public: public:
typedef typename L2<T>::ElementType ElementType; typedef typename L2<T>::ElementType ElementType;
typedef typename L2<T>::ResultType DistanceType; typedef typename L2<T>::ResultType DistanceType;
...@@ -277,8 +281,10 @@ private: ...@@ -277,8 +281,10 @@ private:
::cvflann::Index< L1<ElementType> >* nnIndex_L1; ::cvflann::Index< L1<ElementType> >* nnIndex_L1;
}; };
#ifdef _MSC_VER
template <typename T> template <typename T>
class FLANN_DEPRECATED Index_; class FLANN_DEPRECATED Index_;
#endif
template <typename T> template <typename T>
Index_<T>::Index_(const Mat& dataset, const ::cvflann::IndexParams& params) Index_<T>::Index_(const Mat& dataset, const ::cvflann::IndexParams& params)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment