projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cb1565e
)
Fixed flann deprecation warnings from flann itself
author
Andrey Kamaev
<no@email>
Tue, 10 Apr 2012 08:27:39 +0000
(08:27 +0000)
committer
Andrey Kamaev
<no@email>
Tue, 10 Apr 2012 08:27:39 +0000
(08:27 +0000)
modules/flann/include/opencv2/flann/flann.hpp
patch
|
blob
|
history
diff --git
a/modules/flann/include/opencv2/flann/flann.hpp
b/modules/flann/include/opencv2/flann/flann.hpp
index
ff19f62
..
a01e1a8
100644
(file)
--- a/
modules/flann/include/opencv2/flann/flann.hpp
+++ b/
modules/flann/include/opencv2/flann/flann.hpp
@@
-225,7
+225,7
@@
int GenericIndex<Distance>::radiusSearch(const Mat& query, Mat& indices, Mat& di
* @deprecated Use GenericIndex class instead
*/
template <typename T>
-class
FLANN_DEPRECATED
Index_ {
+class Index_ {
public:
typedef typename L2<T>::ElementType ElementType;
typedef typename L2<T>::ResultType DistanceType;
@@
-277,6
+277,8
@@
private:
::cvflann::Index< L1<ElementType> >* nnIndex_L1;
};
+template <typename T>
+class FLANN_DEPRECATED Index_;
template <typename T>
Index_<T>::Index_(const Mat& dataset, const ::cvflann::IndexParams& params)