Alexander Alekhin
9c23f2f1a6
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-20 11:37:54 +00:00
Michał Janiszewski
85b9960f62
Fix clashing include guards
...
Relevant guards can be found in
ef5579dc86/modules/features2d/src/kaze/AKAZEConfig.h (L8)
and
ef5579dc86/modules/ml/include/opencv2/ml.hpp (L44)
2018-10-16 22:59:38 +02:00
Alexander Alekhin
690fb0544c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-02 14:31:05 +03:00
Dmitry Kurtaev
e9f99063c7
JavaScript bindings for features2d module
2018-09-28 11:04:13 +03:00
Hamdi Sahloul
e104fcc000
Generate enum bindings automatically
2018-09-28 15:39:51 +09: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
Alexander Alekhin
5fb0f34e8a
Merge pull request #12570 from alalek:drop_usrtype1
...
* core: drop usage of CV_USRTYPE1 in OpenCV
avoid OpenCV crashes due size change CV_ELEM_SIZE(CV_USRTYPE1): 8 -> 2
* ! fix persistence internal types
2018-09-19 13:55:26 +03:00
Alexander Alekhin
808ba552c5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-14 23:44:35 +00:00
Hamdi Sahloul
5d54def264
Add semicolons after CV_INSTRUMENT
macros
2018-09-14 06:45:31 +09:00
Hamdi Sahloul
03b3be0f51
MSVC: Slience external/meaningless warnings
2018-09-12 20:02:13 +09:00
Alexander Alekhin
dca657a2fd
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-10 00:10:21 +03:00
Alexander Alekhin
b50c70bbfa
features2d(test): extract common extract/invariance test code
...
to share with opencv_contrib/xfeatures2d
2018-09-07 19:30:51 +03:00
Hamdi Sahloul
a39e0daacf
Utilize CV_UNUSED macro
2018-09-07 20:33:52 +09:00
Jakub Golinowski
9f1218b00b
Merge pull request #11897 from Jakub-Golinowski:hpx_backend
...
* Add HPX backend for OpenCV implementation
Adds hpx backend for cv::parallel_for_() calls respecting the nstripes chunking parameter. C++ code for the backend is added to modules/core/parallel.cpp. Also, the necessary changes to cmake files are introduced.
Backend can operate in 2 versions (selectable by cmake build option WITH_HPX_STARTSTOP): hpx (runtime always on) and hpx_startstop (start and stop the backend for each cv::parallel_for_() call)
* WIP: Conditionally include hpx_main.hpp to tests in core module
Header hpx_main.hpp is included to both core/perf/perf_main.cpp and core/test/test_main.cpp.
The changes to cmake files for linking hpx library to above mentioned test executalbles are proposed but have issues.
* Add coditional iclusion of hpx_main.hpp to cpp cpu modules
* Remove start/stop version of hpx backend
2018-08-31 16:23:26 +03:00
Alexander Alekhin
4eb2966559
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-08-07 20:12:10 +03:00
luz.paz
2003eb1b9b
Misc. typos
...
Found via `codespell -q 3 -I ../opencv-whitelist.txt --skip="./3rdparty"`
2018-07-31 18:44:23 +03:00
Alexander Alekhin
9787ab598b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-24 22:48:54 +03:00
Maksim Shabunin
cbb1e867e5
More issues found by static analysis
2018-07-24 16:04:42 +03:00
Alexander Alekhin
4560909a5e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-17 19:27:48 +03:00
Maksim Shabunin
1da46fe6fb
Fixed issues found by static analysis (mostly DBZ)
2018-07-17 16:14:54 +03:00
Alexander Alekhin
2da96be217
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-09 19:44:51 +03:00
Alexander Alekhin
b09a4a98d4
opencv: Use cv::AutoBuffer<>::data()
2018-07-04 19:11:29 +03:00
Alexander Alekhin
45dd575ed2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
...
Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch"
This reverts commit 9ba9358ecb
.
Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch (2)"
This reverts commit f185802489
.
2018-06-04 19:26:10 +03:00
Vadim Pisarevsky
7d19bd6c19
Merge pull request #11634 from vpisarev:empty_mat_with_types_2
...
fixes handling of empty matrices in some functions (#11634 )
* a part of PR #11416 by Yuki Takehara
* moved the empty mat check in Mat::copyTo()
* fixed some test failures
2018-05-31 16:36:39 +00:00
berak
6ddef3b7a9
features2d: remove deprecated java wrappers
2018-05-16 16:13:18 +02:00
Alexander Alekhin
cd2b188c9a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-04-24 18:13:06 +03:00
Alexander Alekhin
6b581c4e51
build: unreachable code after CV_Error() (part 2)
2018-04-24 16:03:40 +03:00
Alexander Alekhin
5b17a60dde
next: drop HAVE_TEGRA_OPTIMIZATION/TADP
2018-04-10 18:09:54 +03:00
Alexander Alekhin
0854dc3320
features2d: apply CV_OVERRIDE/CV_FINAL
2018-03-28 17:57:59 +03:00
vasiliev-vb
94c8e59bbe
Fixed bug in KAZE features orientation.
...
Bug was added in f6ceeaa
commit, different angle computation functions have different parameter order.
2018-03-13 15:09:36 +00:00
Alexander Alekhin
da6dc6774b
features2d: add verbose messages into tests
...
To investigate sporadic failures of Features2d_FLANN_Auto.regression test.
2018-02-28 19:47:16 +00:00
mworchel
aab390c51d
Add mask support to SimpleBlobDetector
2018-02-19 17:54:27 +03:00
luz.paz
d05714995c
Misc. modules/ cont. pt2
...
Found via `codespell`
2018-02-13 11:28:11 -05:00
Alexander Alekhin
4a297a2443
ts: refactor OpenCV tests
...
- removed tr1 usage (dropped in C++17)
- moved includes of vector/map/iostream/limits into ts.hpp
- require opencv_test + anonymous namespace (added compile check)
- fixed norm() usage (must be from cvtest::norm for checks) and other conflict functions
- added missing license headers
2018-02-03 19:39:47 +00:00
Alexander Alekhin
12cd3b55ec
Merge pull request #10756 from terfendail:orb_firstlevel
2018-02-01 18:34:57 +00:00
Vitaly Tuzov
26321795f7
Fixed assertion in ORB::setFirstLevel()
2018-02-01 16:58:35 +03:00
Vadim Pisarevsky
f780ee12a0
Merge pull request #10690 from terfendail:orb_firstlevel
2018-02-01 13:41:29 +00:00
Tomoaki Teshima
5f4b48da34
fix build error on Visual Studio 2013 and earlier
2018-01-31 18:22:09 +09:00
Vitaly Tuzov
205022ceee
Fixed issue in ORB detection if firstLevel property is set above 0
2018-01-25 16:14:16 +03:00
Elena Gvozdeva
b97b650ab3
add HAL for FAST ( #10362 )
...
* add HAL for FAST
* add new interface
2018-01-24 01:48:06 +03:00
Maksim Shabunin
8b87c4b96a
Fixed several warnings produced by clang 6 and static analyzers
2018-01-16 15:26:28 +03:00
Hamdi Sahloul
2d2499f610
BLOB - Support RGBA
2018-01-07 14:30:40 +09:00
Tomoaki Teshima
fe7b3f1228
clean up the code
...
* disable the warning in CMake, not int the code using pragma
2017-12-22 08:42:21 +09:00
Vitaly Tuzov
51cb56ef2c
Implementation of bit-exact resize. Internal calls to linear resize updated to use bit-exact version. ( #9468 )
2017-12-13 15:00:38 +03:00
Pavel Rojtberg
6fb9d42c3f
Hid symbols in static builds, added LTO flags, removed exports from ts
2017-12-07 10:26:48 +03:00
Vadim Pisarevsky
f5dba12762
Merge pull request #10180 from alalek:ocl_avoid_unnecessary_initialization
2017-11-29 11:42:22 +00:00
Alexander Alekhin
0ed3209b00
ocl: avoid unnecessary loading/initializing OpenCL subsystem
...
If there are no OpenCL/UMat methods calls from application.
OpenCL subsystem is initialized:
- haveOpenCL() is called from application
- useOpenCL() is called from application
- access to OpenCL allocator: UMat is created (empty UMat is ignored) or UMat <-> Mat conversions are called
Don't call OpenCL functions if OPENCV_OPENCL_RUNTIME=disabled
(independent from OpenCL linkage type)
2017-11-28 14:02:42 +03:00
Pavel Rojtberg
6fbf0758bc
Python: wrap Algorithm::read and Algorithm::write
2017-11-27 17:04:56 +01:00
Jcrist99
0608227e10
Merge pull request #9698 from abratchik:parse.doxygen
...
Support @deprecated tag in java wrappers (#9698 )
2017-11-16 16:48:12 +03:00
Vitaly Tuzov
2eb61a4a99
AVX2 optimized implementation of FAST corner tracking migrated to separate file
2017-10-24 20:00:48 +03:00