Skip to content

Commit c6c5191

Browse files
mshabuninmshabunin
committed
Added CV_DEPRECATED macro
1 parent 205ccdd commit c6c5191

File tree

6 files changed

+28
-31
lines changed

6 files changed

+28
-31
lines changed

‎doc/Doxyfile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ PREDEFINED = __cplusplus=1 \
251251
CV_DEFAULT(x)=" = x" \
252252
CV_NEON=1 \
253253
CV_SSE2=1 \
254-
FLANN_DEPRECATED=
254+
CV_DEPRECATED=
255255
EXPAND_AS_DEFINED =
256256
SKIP_FUNCTION_MACROS = YES
257257
TAGFILES =

‎modules/core/include/opencv2/core/cvdef.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,16 @@ Cv64suf;
369369
# define CV_EXPORTS
370370
#endif
371371

372+
#ifndef CV_DEPRECATED
373+
# if defined(__GNUC__)
374+
# define CV_DEPRECATED __attribute__ ((deprecated))
375+
# elif defined(_MSC_VER)
376+
# define CV_DEPRECATED __declspec(deprecated)
377+
# else
378+
# define CV_DEPRECATED
379+
# endif
380+
#endif
381+
372382
#ifndef CV_EXTERN_C
373383
# ifdef __cplusplus
374384
# define CV_EXTERN_C extern "C"

‎modules/flann/include/opencv2/flann.hpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ can be found in @cite Muja2009 .
5959
namespace cvflann
6060
{
6161
CV_EXPORTS flann_distance_t flann_distance_type();
62-
FLANN_DEPRECATED CV_EXPORTS void set_distance_type(flann_distance_t distance_type, int order);
62+
CV_DEPRECATED CV_EXPORTS void set_distance_type(flann_distance_t distance_type, int order);
6363
}
6464

6565

@@ -230,7 +230,7 @@ class GenericIndex
230230

231231
::cvflann::IndexParams getParameters() { return nnIndex->getParameters(); }
232232

233-
FLANN_DEPRECATED const ::cvflann::IndexParams* getIndexParameters() { return nnIndex->getIndexParameters(); }
233+
CV_DEPRECATED const ::cvflann::IndexParams* getIndexParameters() { return nnIndex->getIndexParameters(); }
234234

235235
private:
236236
::cvflann::Index<Distance>* nnIndex;
@@ -344,7 +344,7 @@ class Index_
344344
typedef typename L2<T>::ElementType ElementType;
345345
typedef typename L2<T>::ResultType DistanceType;
346346

347-
FLANN_DEPRECATED Index_(const Mat& dataset, const ::cvflann::IndexParams& params)
347+
CV_DEPRECATED Index_(const Mat& dataset, const ::cvflann::IndexParams& params)
348348
{
349349
printf("[WARNING] The cv::flann::Index_<T> class is deperecated, use cv::flann::GenericIndex<Distance> instead\n");
350350

@@ -368,13 +368,13 @@ class Index_
368368
if (nnIndex_L1) nnIndex_L1->buildIndex();
369369
if (nnIndex_L2) nnIndex_L2->buildIndex();
370370
}
371-
FLANN_DEPRECATED ~Index_()
371+
CV_DEPRECATED ~Index_()
372372
{
373373
if (nnIndex_L1) delete nnIndex_L1;
374374
if (nnIndex_L2) delete nnIndex_L2;
375375
}
376376

377-
FLANN_DEPRECATED void knnSearch(const std::vector<ElementType>& query, std::vector<int>& indices, std::vector<DistanceType>& dists, int knn, const ::cvflann::SearchParams& searchParams)
377+
CV_DEPRECATED void knnSearch(const std::vector<ElementType>& query, std::vector<int>& indices, std::vector<DistanceType>& dists, int knn, const ::cvflann::SearchParams& searchParams)
378378
{
379379
::cvflann::Matrix<ElementType> m_query((ElementType*)&query[0], 1, query.size());
380380
::cvflann::Matrix<int> m_indices(&indices[0], 1, indices.size());
@@ -383,7 +383,7 @@ class Index_
383383
if (nnIndex_L1) nnIndex_L1->knnSearch(m_query,m_indices,m_dists,knn,searchParams);
384384
if (nnIndex_L2) nnIndex_L2->knnSearch(m_query,m_indices,m_dists,knn,searchParams);
385385
}
386-
FLANN_DEPRECATED void knnSearch(const Mat& queries, Mat& indices, Mat& dists, int knn, const ::cvflann::SearchParams& searchParams)
386+
CV_DEPRECATED void knnSearch(const Mat& queries, Mat& indices, Mat& dists, int knn, const ::cvflann::SearchParams& searchParams)
387387
{
388388
CV_Assert(queries.type() == CvType<ElementType>::type());
389389
CV_Assert(queries.isContinuous());
@@ -401,7 +401,7 @@ class Index_
401401
if (nnIndex_L2) nnIndex_L2->knnSearch(m_queries,m_indices,m_dists,knn, searchParams);
402402
}
403403

404-
FLANN_DEPRECATED int radiusSearch(const std::vector<ElementType>& query, std::vector<int>& indices, std::vector<DistanceType>& dists, DistanceType radius, const ::cvflann::SearchParams& searchParams)
404+
CV_DEPRECATED int radiusSearch(const std::vector<ElementType>& query, std::vector<int>& indices, std::vector<DistanceType>& dists, DistanceType radius, const ::cvflann::SearchParams& searchParams)
405405
{
406406
::cvflann::Matrix<ElementType> m_query((ElementType*)&query[0], 1, query.size());
407407
::cvflann::Matrix<int> m_indices(&indices[0], 1, indices.size());
@@ -411,7 +411,7 @@ class Index_
411411
if (nnIndex_L2) return nnIndex_L2->radiusSearch(m_query,m_indices,m_dists,radius,searchParams);
412412
}
413413

414-
FLANN_DEPRECATED int radiusSearch(const Mat& query, Mat& indices, Mat& dists, DistanceType radius, const ::cvflann::SearchParams& searchParams)
414+
CV_DEPRECATED int radiusSearch(const Mat& query, Mat& indices, Mat& dists, DistanceType radius, const ::cvflann::SearchParams& searchParams)
415415
{
416416
CV_Assert(query.type() == CvType<ElementType>::type());
417417
CV_Assert(query.isContinuous());
@@ -429,32 +429,32 @@ class Index_
429429
if (nnIndex_L2) return nnIndex_L2->radiusSearch(m_query,m_indices,m_dists,radius,searchParams);
430430
}
431431

432-
FLANN_DEPRECATED void save(String filename)
432+
CV_DEPRECATED void save(String filename)
433433
{
434434
if (nnIndex_L1) nnIndex_L1->save(filename);
435435
if (nnIndex_L2) nnIndex_L2->save(filename);
436436
}
437437

438-
FLANN_DEPRECATED int veclen() const
438+
CV_DEPRECATED int veclen() const
439439
{
440440
if (nnIndex_L1) return nnIndex_L1->veclen();
441441
if (nnIndex_L2) return nnIndex_L2->veclen();
442442
}
443443

444-
FLANN_DEPRECATED int size() const
444+
CV_DEPRECATED int size() const
445445
{
446446
if (nnIndex_L1) return nnIndex_L1->size();
447447
if (nnIndex_L2) return nnIndex_L2->size();
448448
}
449449

450-
FLANN_DEPRECATED ::cvflann::IndexParams getParameters()
450+
CV_DEPRECATED ::cvflann::IndexParams getParameters()
451451
{
452452
if (nnIndex_L1) return nnIndex_L1->getParameters();
453453
if (nnIndex_L2) return nnIndex_L2->getParameters();
454454

455455
}
456456

457-
FLANN_DEPRECATED const ::cvflann::IndexParams* getIndexParameters()
457+
CV_DEPRECATED const ::cvflann::IndexParams* getIndexParameters()
458458
{
459459
if (nnIndex_L1) return nnIndex_L1->getIndexParameters();
460460
if (nnIndex_L2) return nnIndex_L2->getIndexParameters();
@@ -505,7 +505,7 @@ int hierarchicalClustering(const Mat& features, Mat& centers, const ::cvflann::K
505505
/** @deprecated
506506
*/
507507
template <typename ELEM_TYPE, typename DIST_TYPE>
508-
FLANN_DEPRECATED int hierarchicalClustering(const Mat& features, Mat& centers, const ::cvflann::KMeansIndexParams& params)
508+
CV_DEPRECATED int hierarchicalClustering(const Mat& features, Mat& centers, const ::cvflann::KMeansIndexParams& params)
509509
{
510510
printf("[WARNING] cv::flann::hierarchicalClustering<ELEM_TYPE,DIST_TYPE> is deprecated, use "
511511
"cv::flann::hierarchicalClustering<Distance> instead\n");

‎modules/flann/include/opencv2/flann/defines.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,6 @@
5050
#endif
5151

5252

53-
#ifdef FLANN_DEPRECATED
54-
#undef FLANN_DEPRECATED
55-
#endif
56-
#ifdef __GNUC__
57-
#define FLANN_DEPRECATED __attribute__ ((deprecated))
58-
#elif defined(_MSC_VER)
59-
#define FLANN_DEPRECATED __declspec(deprecated)
60-
#else
61-
#pragma message("WARNING: You need to implement FLANN_DEPRECATED for this compiler")
62-
#define FLANN_DEPRECATED
63-
#endif
64-
65-
6653
#undef FLANN_PLATFORM_32_BIT
6754
#undef FLANN_PLATFORM_64_BIT
6855
#if defined __amd64__ || defined __x86_64__ || defined _WIN64 || defined _M_X64

‎modules/flann/include/opencv2/flann/flann_base.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ class Index : public NNIndex<Distance>
241241
/**
242242
* \brief Returns actual index
243243
*/
244-
FLANN_DEPRECATED NNIndex<Distance>* getIndex()
244+
CV_DEPRECATED NNIndex<Distance>* getIndex()
245245
{
246246
return nnIndex_;
247247
}
@@ -250,7 +250,7 @@ class Index : public NNIndex<Distance>
250250
* \brief Returns index parameters.
251251
* \deprecated use getParameters() instead.
252252
*/
253-
FLANN_DEPRECATED const IndexParams* getIndexParameters()
253+
CV_DEPRECATED const IndexParams* getIndexParameters()
254254
{
255255
return &index_params_;
256256
}

‎modules/flann/include/opencv2/flann/matrix.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class Matrix
6666
/**
6767
* Convenience function for deallocating the storage data.
6868
*/
69-
FLANN_DEPRECATED void free()
69+
CV_DEPRECATED void free()
7070
{
7171
fprintf(stderr, "The cvflann::Matrix<T>::free() method is deprecated "
7272
"and it does not do any memory deallocation any more. You are"

0 commit comments

Comments
 (0)