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:

Hamdi Sahloul

2018-09-22 00:12:35 +09:00

committed by

Alexander Alekhin

parent 84ae8097b1

commit ef5579dc86

51 changed files with 567 additions and 333 deletions

									
										modules/features2d/test/test_orb.cpp
									
		+1
		-1
	
												View File
												
				@@ -100,7 +100,7 @@ TEST(Features2D_ORB, crash)

				    int edgeThreshold = 4;

				    int firstLevel = 0;

				    int WTA_K = 2;

				    int scoreType = cv::ORB::HARRIS_SCORE;

				    ORB::ScoreType scoreType = cv::ORB::HARRIS_SCORE;

				    int patchSize = 47;

				    int fastThreshold = 20;