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

Corrected fix of flann deprecation warnings

Browse Source
This commit is contained in:
Andrey Kamaev 2012-04-10 19:16:31 +00:00
parent 4507764845
commit 1cf96d36cd
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/flann/include/opencv2/flann/flann.hpp
View File

@ -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:
::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)