diff --git a/modules/features2d/perf/perf_feature2d.hpp b/modules/features2d/perf/perf_feature2d.hpp index d190fc56c1..fe1ac78624 100644 --- a/modules/features2d/perf/perf_feature2d.hpp +++ b/modules/features2d/perf/perf_feature2d.hpp @@ -1,3 +1,6 @@ +#ifndef __OPENCV_PERF_FEATURE2D_HPP__ +#define __OPENCV_PERF_FEATURE2D_HPP__ + #include "perf_precomp.hpp" /* cofiguration for tests of detectors/descriptors. shared between ocl and cpu tests. */ @@ -22,8 +25,10 @@ using std::tr1::get; BRISK_DEFAULT, \ KAZE_DEFAULT +#define CV_ENUM_EXPAND(name, ...) CV_ENUM(name, __VA_ARGS__) + enum Feature2DVals { DETECTORS_ONLY, DETECTORS_EXTRACTORS }; -CV_ENUM(Feature2DType, DETECTORS_ONLY, DETECTORS_EXTRACTORS) +CV_ENUM_EXPAND(Feature2DType, DETECTORS_ONLY, DETECTORS_EXTRACTORS) typedef std::tr1::tuple Feature2DType_String_t; typedef perf::TestBaseWithParam feature2d; @@ -77,3 +82,5 @@ static inline Ptr getFeature2D(Feature2DType type) return Ptr(); } } + +#endif // __OPENCV_PERF_FEATURE2D_HPP__