Merge pull request #12310 from cv3d:chunks/enum_interface
authorHamdi Sahloul <42140441+cv3d@users.noreply.github.com>
Fri, 21 Sep 2018 15:12:35 +0000 (00:12 +0900)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 21 Sep 2018 15:12:35 +0000 (18:12 +0300)
commitef5579dc8667e5eb5e149acc4af898421eed99da
tree1b24c781a66498eccedbcdda72abc8c6993a2b2c
parent84ae8097b1478ed5d253fd011cc96a7f054b0253
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
51 files changed:
modules/core/include/opencv2/core.hpp
modules/core/include/opencv2/core/base.hpp
modules/core/include/opencv2/core/cvdef.h
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/mat.inl.hpp
modules/core/include/opencv2/core/opengl.hpp
modules/core/include/opencv2/core/operations.hpp
modules/core/include/opencv2/core/persistence.hpp
modules/core/include/opencv2/core/utility.hpp
modules/core/misc/python/pyopencv_umat.hpp
modules/core/misc/python/shadow_umat.hpp
modules/core/src/arithm.cpp
modules/core/src/command_line_parser.cpp
modules/core/src/cuda_host_mem.cpp
modules/core/src/matrix.cpp
modules/core/src/matrix_wrap.cpp
modules/core/src/ocl.cpp
modules/core/src/opengl.cpp
modules/core/src/out.cpp
modules/core/src/precomp.hpp
modules/core/src/umatrix.cpp
modules/core/test/test_mat.cpp
modules/dnn/include/opencv2/dnn/dict.hpp
modules/dnn/include/opencv2/dnn/dnn.inl.hpp
modules/features2d/include/opencv2/features2d.hpp
modules/features2d/misc/python/pyopencv_features2d.hpp
modules/features2d/src/agast.cpp
modules/features2d/src/agast_score.cpp
modules/features2d/src/agast_score.hpp
modules/features2d/src/akaze.cpp
modules/features2d/src/draw.cpp
modules/features2d/src/fast.cpp
modules/features2d/src/hal_replacement.hpp
modules/features2d/src/kaze.cpp
modules/features2d/src/kaze/AKAZEConfig.h
modules/features2d/src/kaze/AKAZEFeatures.cpp
modules/features2d/src/kaze/KAZEConfig.h
modules/features2d/src/matchers.cpp
modules/features2d/src/orb.cpp
modules/features2d/test/test_agast.cpp
modules/features2d/test/test_fast.cpp
modules/features2d/test/test_orb.cpp
modules/objdetect/include/opencv2/objdetect.hpp
modules/objdetect/misc/python/pyopencv_objdetect.hpp [new file with mode: 0644]
modules/objdetect/src/hog.cpp
modules/python/src2/cv2.cpp
modules/stitching/include/opencv2/stitching/detail/matchers.hpp
modules/stitching/src/matchers.cpp
modules/ts/include/opencv2/ts.hpp
modules/ts/src/ts_func.cpp
modules/video/src/lkpyramid.cpp