Alexander Alekhin
|
85ade61ef7
|
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
|
2018-12-27 18:15:50 +03:00 |
|
Dmitry Kurtaev
|
ff8c53ea20
|
Merge pull request #13481 from dkurt:fix_13227
* Fix drawMatches and drawKeypoints for BGRA input images
* keep BGRA too
* Combine different input types for drawMatches test
|
2018-12-25 17:29:12 +03:00 |
|
Alexander Alekhin
|
7fa7fa0226
|
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
|
2018-11-21 08:33:39 +00:00 |
|
Dan Mašek
|
2075fa9c15
|
Resolve #13219: Make randomly generated colours opaque.
|
2018-11-20 15:08:40 +01:00 |
|
Hamdi Sahloul
|
ef5579dc86
|
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
|
2018-09-21 18:12:35 +03:00 |
|
Hamdi Sahloul
|
5d54def264
|
Add semicolons after CV_INSTRUMENT macros
|
2018-09-14 06:45:31 +09:00 |
|
Pavel Vlasov
|
30a6cee2fe
|
Instrumentation for OpenCV API regions and IPP functions;
|
2016-08-19 18:10:03 +03:00 |
|
Niklas Frisk
|
8138e26163
|
Fixes #3910, flags in _prepareImgAndDrawKeypoints are now binary OR'ed instead of added.
Conflicts:
modules/features2d/src/draw.cpp
|
2015-05-24 13:31:11 +02:00 |
|
Konstantin Matskevich
|
b0f617bc01
|
fixes
|
2014-02-05 09:59:04 +04:00 |
|
Konstantin Matskevich
|
f44334285b
|
features2d
|
2014-02-04 16:55:07 +04:00 |
|
Andrey Kamaev
|
c98c246fc2
|
Move border type constants and Moments class to core module
|
2013-04-10 19:14:24 +04:00 |
|
Andrey Kamaev
|
2a6fb2867e
|
Remove all using directives for STL namespace and members
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
|
2013-02-25 15:04:17 +04:00 |
|
mdim
|
93f8e7ba74
|
check of keypoint index range in drawMatches
|
2013-01-22 00:37:27 +04:00 |
|
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
2012-10-17 15:32:23 +04:00 |
|
Andrey Kamaev
|
d4df1e0b5c
|
Merged the trunk r8887, r8891, r8314
|
2012-07-02 12:33:37 +00:00 |
|
Andrey Kamaev
|
bd0e0b5800
|
Merged the trunk r8589:8653 - all changes related to build warnings
|
2012-06-15 13:04:17 +00:00 |
|
Vadim Pisarevsky
|
2e9f5c434b
|
added improved ORB implementation, convex-convex polygon intersection, eigen2x2 low-level function ...
|
2011-11-08 12:01:49 +00:00 |
|
Maria Dimashova
|
dc14b45617
|
minor changes
|
2011-08-08 12:47:04 +00:00 |
|
Maria Dimashova
|
0d55ccac74
|
added check of output image in drawKeypoints()
|
2011-08-05 14:04:38 +00:00 |
|
Maria Dimashova
|
8a61375875
|
fixed drawKeypoints (keypoint orientation)
|
2011-05-30 09:11:27 +00:00 |
|
Maria Dimashova
|
1748f65f54
|
fixed ticket #823
|
2011-01-31 09:51:17 +00:00 |
|
Maria Dimashova
|
69e329c9fd
|
modified features2d interface; added algorithmic test for DescriptorMatcher; added sample on matching to many images
|
2010-10-29 08:44:42 +00:00 |
|
Maria Dimashova
|
8462deed30
|
split descriptors.cpp
|
2010-09-23 13:44:23 +00:00 |
|