Merge pull request #12310 from cv3d:chunks/enum_interface
* Cleanup macros and enable expansion of `__VA_ARGS__` for Visual Studio * Macros for enum-arguments backwards compatibility * Convert struct Param to enum struct * Enabled ParamType.type for enum types * Enabled `cv.read` and `cv.write` for enum types * Rename unnamed enum to AAKAZE.DescriptorType * Rename unnamed enum to AccessFlag * Rename unnamed enum to AgastFeatureDetector.DetectorType * Convert struct DrawMatchesFlags to enum struct * Rename unnamed enum to FastFeatureDetector.DetectorType * Rename unnamed enum to Formatter.FormatType * Rename unnamed enum to HOGDescriptor.HistogramNormType * Rename unnamed enum to DescriptorMatcher.MatcherType * Rename unnamed enum to KAZE.DiffusivityType * Rename unnamed enum to ORB.ScoreType * Rename unnamed enum to UMatData.MemoryFlag * Rename unnamed enum to _InputArray.KindFlag * Rename unnamed enum to _OutputArray.DepthMask * Convert normType enums to static const NormTypes * Avoid conflicts with ElemType * Rename unnamed enum to DescriptorStorageFormat
This commit is contained in:
committed by
Alexander Alekhin
parent
84ae8097b1
commit
ef5579dc86
@@ -576,13 +576,13 @@ void OrbFeaturesFinder::find(InputArray image, ImageFeatures &features)
|
||||
}
|
||||
}
|
||||
|
||||
AKAZEFeaturesFinder::AKAZEFeaturesFinder(int descriptor_type,
|
||||
AKAZEFeaturesFinder::AKAZEFeaturesFinder(AKAZE::DescriptorType descriptor_type,
|
||||
int descriptor_size,
|
||||
int descriptor_channels,
|
||||
float threshold,
|
||||
int nOctaves,
|
||||
int nOctaveLayers,
|
||||
int diffusivity)
|
||||
KAZE::DiffusivityType diffusivity)
|
||||
{
|
||||
akaze = AKAZE::create(descriptor_type, descriptor_size, descriptor_channels,
|
||||
threshold, nOctaves, nOctaveLayers, diffusivity);
|
||||
|
||||
Reference in New Issue
Block a user