Patrick Snape
05cfe28612
Fix parsing of training vecs for FlannBasedMatcher
...
FlannBasedMatcher::add is overloaded, but the style of parsing the
InputArrayOfArrays does not match the style from
DescriptorMatcher::add. The issue is that InputArrayOfArrays
must be properly marshalled so that the data can be read
correctly. In this case, the method expects the training
descriptors to be either a vector of matrices or a single matrix
(as is shown in DescriptorMatcher::add). These code
replicates that for the case of the FlannBasedMatcher::add.
In fact, a similar commit to this was added by 26d9a7c
but was
ultimately not accepted in #4111 . This is likely due to the
fact that the input arrays were not parsed properly and the
case of a single matrix was being improperly handled. I believe
this commit to be correct given the logic from
DescriptorMatcher::add.
2016-01-23 15:58:16 +00:00
Patrick Snape
2f5ea3437e
Update indentation to match rest of file
...
Very cosmetic, but was analyzing code and just wanted to make it
consistent.
2016-01-23 15:57:46 +00:00
Alexander Alekhin
3d85e7ac0d
features2d agast: clear in/out keypoints container
...
fixes #5863
2015-12-25 13:49:24 +03:00
Alexander Alekhin
323e24e3ef
change links from samples/python2 to samples/python
2015-12-18 11:00:30 +03:00
Maksim Shabunin
84f37d352f
HAL moved back to core
2015-12-17 12:33:23 +03:00
Maksim Shabunin
24284d3d17
[move sift.cpp] Fixed HAL headers location
...
original commit: f529a1df2b
2015-12-15 18:41:26 +03:00
Vadim Pisarevsky
8e67f0ba84
Merge pull request #5774 from mshabunin:coverity_fixes
2015-12-09 13:32:44 +00:00
Maksim Shabunin
2cda78ffac
Valgrind: fixed uninitialized image usage in descriptors regression tests
2015-12-09 14:25:09 +03:00
Balint Cristian
0087c57e0d
Fix KAZE/AKAZE descriptors to use angle instead radians.
2015-12-08 22:04:41 +02:00
Vadim Pisarevsky
9d624f82c0
Merge pull request #5670 from askourik:opencv_agast_tree
2015-12-08 16:46:11 +00:00
Vadim Pisarevsky
9c0a5523e4
Merge pull request #5757 from alalek:merge-2.4
2015-12-08 11:51:29 +00:00
Alexander Alekhin
d86d8ed909
Merge 2.4 into master
...
PR #2968 : cce2d99
8578f9c
Fixed bug which caused crash of GPU version of feature matcher in stitcher
The bug caused crash of GPU version of feature matcher in stitcher when
we use ORB features.
PR #3236 : 5947519
Check sure that we're not already below required leaf false alarm rate before continuing to get negative samples.
PR #3190
fix blobdetector
PR #3562 (part): 82bd82e
TBB updated to 4.3u2. Fix for aarch64 support.
PR #3604 (part): 091c7a3
OpenGL interop sample reworked not ot use cvconfig.h
PR #3792 : afdf319
Add -L for CUDA libs path to pkg-config
Add all dirs from CUDA_LIBS_PATH as -L linker options to
OPENCV_LINKER_LIBS. These will end up in opencv.pc.
PR #3893 : 122b9f8
Turn ocv_convert_to_lib_name into a function
PR #5490 : ec5244a
fixed memory leak in findHomography tests
PR #5491 : 0d5b739
delete video readers
PR #5574
PR #5202
2015-12-08 10:24:54 +03:00
Dominik Kleiser
0c471515fd
use float for CV_PI
2015-12-02 17:33:40 +01:00
Dominik Kleiser
c7cb028035
use floats for the calculation
2015-12-02 16:38:44 +01:00
Dominik Kleiser
767bae44ae
Fix the unit of angle for AKaze/Kaze KeyPoints
...
Convert the return value of getAngle from radian to degrees.
2015-12-02 11:51:37 +01:00
Alexander Alekhin
8524d46fee
Merge pull request #5633 from mshabunin:doc-mser
2015-11-30 09:48:39 +00:00
askourik
fedf064088
removing code duplicates and replace unsigned long by uint32_t
2015-11-23 23:47:23 +03:00
askourik
b3e8c65e5e
removed code duplication for non-intel platforms
2015-11-23 22:41:35 +03:00
askourik
4cf7ddfd87
Added new function definition in AGAST module header for tree-optimized version
2015-11-23 22:11:01 +03:00
Maksim Shabunin
bd53a30e76
Merge pull request #5658 from berak:akaze_fix
2015-11-23 09:51:23 +00:00
askourik
a6bbe06379
Merge branch 'opencv_agast_tree' of https://github.com/askourik/opencv into opencv_agast_tree
2015-11-19 07:41:55 +03:00
askourik
cc5a1d612e
added comments and test perl examples for agast tree version
2015-11-19 07:39:57 +03:00
askourik
ae66ce9d22
Add treelookups for nonintel
2015-11-19 07:06:20 +03:00
berak
0baf0bdc24
AKAZE: check channels instead of type in detectAndCompute
...
add same CV_32F and CV_16U support for KAZE
2015-11-12 12:48:03 +01:00
Vadim Pisarevsky
3942b1f362
Merge pull request #5340 from alalek:ocl_off
2015-11-10 16:53:36 +00:00
Maksim Shabunin
7392ce0a81
Added some documentation for MSER
2015-11-05 17:17:18 +03:00
Maksim Shabunin
6e9d0d9a0c
Visual Studio 2015 warning and test fixes
2015-10-20 12:48:37 +03:00
Pavel Vlasov
e837d69f8f
IPPInitSingelton was added to contain IPP related global variables;
...
OPENCV_IPP env var now allows to select IPP architecture level for IPP9+;
IPP initialization logic was unified across modules;
2015-10-01 09:58:48 +03:00
Balint Cristian
fdbed4a473
Speedup AGAST nonmax-suppression.
2015-09-26 04:43:07 +03:00
Alexander Alekhin
7213e5f68a
ocl: correct disabling of OpenCL code
2015-09-13 20:28:23 +03:00
Ilya Lavrenov
cf0f47f589
fixed memory leak in descriptor regression tests
2015-09-13 12:14:30 +02:00
Ilya Lavrenov
f7d36bbad5
fixed memory leaks in modules/features2d/test/test_nearestneighbors.cpp
2015-09-13 12:08:19 +02:00
Ilya Lavrenov
e390c8c728
fixed typo
2015-09-11 18:59:33 +02:00
Roman Donchenko
ec0508269a
NearestNeighborTest: use ts->get_rng() instead of (implicit) theRNG()
...
This ensures that test data is not dependent on the order the tests are
executed in.
2015-09-11 18:39:32 +02:00
Maksim Shabunin
771af4f32d
Some changes to support mingw-w64
...
- IPP is disabled by default when compiler is mingw (couldn't make it
work)
- fixed some warnings
- fixed some `__GNUC__` version checks (for correctness and convenience)
- removed UTF-8 BOM from hough.cpp (fixes #5253 )
2015-09-01 00:59:08 +03:00
Ilya Lavrenov
dc441f50cd
fixed memory leak in descriptor regression tests
2015-08-31 17:30:42 +03:00
Ilya Lavrenov
be499b42d9
fixed memory leaks in modules/features2d/test/test_nearestneighbors.cpp
2015-08-31 17:21:55 +03:00
Alexander Alekhin
a00b37d209
Merge pull request #5094 from SpecLad:f2d-ts-rng
2015-08-19 00:45:04 +00:00
Ilya Lavrenov
370d1ff21a
fixed typo
2015-08-15 16:25:25 +03:00
Roman Donchenko
1245cd1752
NearestNeighborTest: use ts->get_rng() instead of (implicit) theRNG()
...
This ensures that test data is not dependent on the order the tests are
executed in.
2015-07-30 18:03:48 +03:00
Roman Donchenko
72ddeea479
FREAK: add missing field initialization
2015-07-22 14:06:39 +03:00
Evgeny Agafonchikov
6a6d58d389
Adding test support for WINRT
2015-06-30 15:35:20 +03:00
Vadim Pisarevsky
5e095c8fbd
Merge pull request #4022 from LaurentBerger:ExampleBLOB_MSER
2015-05-28 15:00:36 +00: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
Vadim Pisarevsky
af47b6551f
another attempt to make the MSER test pass. removed possible randomization in parameters from run to run
2015-05-21 17:10:35 +03:00
Vadim Pisarevsky
4c67ae1a0b
fixed failure in Features2d_MSER.cases
2015-05-21 16:27:34 +03:00
Vadim Pisarevsky
dab78c26b1
added reasonable test for MSER (including coverage for http://code.opencv.org/issues/4273 , http://code.opencv.org/issues/1723 and http://code.opencv.org/issues/756 ); also, added some "in-progress" info to the Features2d_Feature2d.no_crash test.
2015-05-21 15:03:17 +03:00
Vadim Pisarevsky
fede94e979
it's now true MSER algorithm that works well on binary images too
2015-05-21 05:44:14 +03:00
Vadim Pisarevsky
b5a7122855
added test to do smoke testing of ORB, KAZE, AKAZE and BRISK on images of different size
2015-05-18 21:16:53 +03:00
Vadim Pisarevsky
fc06a2384b
added test for batch detection/descriptor extraction ( http://code.opencv.org/issues/3943 )
2015-05-18 19:01:00 +03:00
Vadim Pisarevsky
432cf1152a
added read/write functions for vector<DMatch> + the test ( http://code.opencv.org/issues/4308 )
2015-05-18 18:59:37 +03:00
Vadim Pisarevsky
b9792fdc14
Merge pull request #3829 from ippei-i:2.4-flann-lsh-addable-index
2015-05-18 15:38:21 +00:00
laurentBerger
3a53e726dd
example BLOB_MSER and fixed bug in blobdetector
2015-05-07 11:52:06 +02:00
cbalint13
2c6114f58d
Force newer build over buildbot.
2015-05-05 12:19:35 +03:00
cbalint13
8ba1ec22e4
Force buildbot to rebuild.
2015-05-04 19:54:08 +03:00
cbalint13
f426778160
Force buildbot rebuild.
2015-05-02 11:25:22 +03:00
cbalint13
9b87c22e01
Fix bugs in non-max suppression routine.
2015-05-01 22:07:08 +03:00
cbalint13
bbdf21679f
Leave AGAST at thresold=10, cosmetic for perf tests.
2015-04-30 02:23:58 +03:00
cbalint13
e2f74309f7
Default AGAST threshold is 40 (as authors recomandation)
2015-04-29 23:54:16 +03:00
cbalint13
0ec5561b4e
Adjust AGAST perftest to be at parity (better) with FAST ones.
2015-04-29 23:42:57 +03:00
Vadim Pisarevsky
d705c651f2
Merge pull request #3960 from ilya-lavrenov:aarch64_test_fixes
2015-04-28 10:48:33 +00:00
cbalint13
0ded2984b8
Merge remote-tracking branch 'upstream/master' into brisk
2015-04-28 06:48:52 +03:00
Pierre Moulon
901d4995e3
Fix a typo error
...
Fix a typo error
Conflicts:
modules/features2d/include/opencv2/features2d.hpp
2015-04-25 15:07:17 +02:00
Ilya Lavrenov
89e3c508d8
fixed tests for aarch64
2015-04-24 13:56:20 +03:00
Vadim Pisarevsky
ee11a2d266
fully implemented SSE and NEON cases of intrin.hpp; extended the HAL with some basic math functions
2015-04-16 23:00:26 +03:00
Vadim Pisarevsky
9fc872b70b
[move sift.cpp] fixed contrib code to match the HAL
...
original commit: cdddcc8237
2015-04-16 22:52:05 +03:00
cbalint13
dee3a4b528
Add missing opencv_contrib PR #202 patch.
2015-04-11 17:43:28 +03:00
cbalint13
26997f32c6
Fix BRISK detector&descriptor using proper AGAST.
2015-04-11 12:09:13 +03:00
Maksim Shabunin
35b2139929
Basic HAL module
2015-04-07 18:16:22 +03:00
ippei ito
b8c00854fe
instead of "using namespace cv" put all the tests into cv:: namespace.
2015-04-02 19:58:19 +09:00
ippei ito
65b0ecfec5
Test accuracy for PR#3829.Fix WOrder warning on gcc
2015-03-25 18:24:52 +09:00
ippei ito
d1902a1276
Test accuracy for PR#3829.Fix warning on gcc, comment out INIT_RANDOM_SEED for same result each ran.
2015-03-25 05:28:29 +09:00
ippei ito
56cae1b293
Test accuracy for PR#3829.Fix Some Error, Modify SLA.
2015-03-25 03:11:44 +09:00
ippei ito
7c740b6a31
Test accuracy for Pull Request # 3829
2015-03-25 02:38:01 +09:00
ippei ito
cd42e38013
FlannBasedMatcher(LshIndex) in the feature2d optimization for continuance additional train()
...
Current implementation of miniflann is releasing the trained index, and
rebuilding the index from the beginning.
But, some indexing algorithms like the LSH are able to add the indexing
data after that.
This branch is implementation of that optimization for LshIndex
FlannBasedMatcher in the feature2d.
2015-03-14 04:38:07 +09:00
Nils Plath
32d56c6b43
Fixed: wrong conversion of float-based Mat input inside the AKAZE.
2015-03-05 23:55:07 +01:00
Ilya Lavrenov
cf4c79ebdd
disabled some kernels for Android && NVidia
2015-03-04 14:46:49 +03:00
Maksim Shabunin
37c74e38f4
Python support
2015-03-02 18:13:00 +03:00
Maksim Shabunin
457123027e
Modified java wrapping mechanism
2015-03-02 18:12:30 +03:00
Vladislav Vinogradov
cda6fed41f
move tegra namespace out of cv to prevent conflicts
2015-02-27 12:52:11 +03:00
Vladislav Vinogradov
44e41baffe
use new functions before all tegra:: calls
2015-02-26 19:34:58 +03:00
exeltior
b51805e245
Update mser.cpp
...
Need to initialize boolean variable pass2Only, otherwise the result is not predictable
2015-02-16 18:17:41 +01:00
Vladislav Vinogradov
c120001178
fix -Wsign-compare warnings
2015-01-15 17:17:35 +03:00
Vadim Pisarevsky
df57d038b8
Merge pull request #3572 from berak:python_samples_30
2015-01-15 13:17:26 +00:00
berak
fd60e98c5b
fixes for latest changes in opencv3.0 api
...
fixes for latest changes in opencv3.0 api
waitKey() normalization
fixed mser bindings
2015-01-15 12:01:47 +01:00
Yan Wang
75277bb770
Remove unnecessary global/local dim for radius match.
...
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2015-01-09 13:37:00 +08:00
Maksim Shabunin
d01bedbc61
Removed Sphinx documentation files
2014-12-26 19:12:19 +03:00
Vadim Pisarevsky
03df7831ab
Merge pull request #3514 from mshabunin:compat-24
2014-12-22 10:38:56 +00:00
orestis
fffe2464cd
Change DescriptorExtractor_ORB regression test
...
to compensate for neon ieee754 non-compliancy.
Also changed the comparison between max valid and calculated distance to
make the error message more accurate (in case curMaxDist == maxDist)
2014-12-21 21:27:03 +02:00
Maksim Shabunin
91e21847e2
Some changes to make migration to 3.0 easier
2014-12-16 13:00:31 +03:00
StevenPuttemans
db9a0cfbc0
add extra to FeatureDetector docs
2014-12-15 11:31:18 +01:00
Alexander Alekhin
893deb4040
Merge pull request #3483 from wangyan42164:ocl_orb_improve
2014-12-05 12:55:54 +00:00
Yan Wang
2df606f098
Use sincos instead of sin and cos.
...
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2014-12-04 15:48:23 +08:00
Yan Wang
1c9f956b88
Remove unnecesary operations and calculations in loop body.
...
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2014-12-04 15:25:18 +08:00
Maksim Shabunin
03e213ccae
Doxygen documentation: BiB references and fixes
2014-12-01 15:50:55 +03:00
Maksim Shabunin
1523fdcc1c
Doxygen documentation: more fixes and cleanups
2014-12-01 15:50:36 +03:00
Maksim Shabunin
c5a698fb54
Doxygen documentation: calib3d and features2d modules
2014-12-01 15:47:13 +03:00
Vadim Pisarevsky
b476bf2a00
Merge pull request #3294 from mshabunin:fix-ios-warnings-24
2014-11-05 11:35:19 +00:00
Maksim Shabunin
09fb7512ed
Fixed iOS framework compilation warnings
2014-10-27 15:28:21 +03:00
Maksim Shabunin
9b55c09999
Basic doxygen documentation support
...
- updated existing Doxyfile.in
- added corresponding cmake instructions
- added some specific files (layout, icon)
- clean existing doxygen warnings
Conflicts:
CMakeLists.txt
doc/CMakeLists.txt
modules/core/include/opencv2/core.hpp
modules/core/include/opencv2/core/base.hpp
modules/core/include/opencv2/core/cuda.inl.hpp
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/matx.hpp
modules/core/include/opencv2/core/types.hpp
modules/flann/include/opencv2/flann/lsh_table.h
modules/imgproc/include/opencv2/imgproc.hpp
2014-10-23 18:27:26 +04:00
Alexander Alekhin
322593e89f
Merge pull request #3256 from vbystricky:oclopt_BFMatcher
2014-10-21 08:59:23 +00:00
Vadim Pisarevsky
dcee883961
fixed MSVC warnings and iOS framework compile error
2014-10-18 21:58:34 +04:00
Vadim Pisarevsky
d2b9dc5530
quickly corrected the previous refactoring of features2d: moved from set(SOME_PROP, val) to setSomeProp(val)
2014-10-18 20:44:26 +04:00
vbystricky
3787388eac
Optimize OpenCL version of BFMatcher
2014-10-17 19:48:45 +04:00
Vadim Pisarevsky
cc11a8d183
Merge branch 'refactor_features2d_take4' of https://github.com/vpisarev/opencv into refactor_features2d_take4
...
Conflicts:
modules/features2d/src/orb.cpp
2014-10-17 15:13:35 +04:00
Vadim Pisarevsky
54e65598bd
fixed error in OpenCL ORB
2014-10-17 15:02:57 +04:00
Vadim Pisarevsky
1176d4ef84
fixed some more compile errors and test failures
2014-10-17 15:02:56 +04:00
Vadim Pisarevsky
9c9ecc22e2
fixed opencv_java build
2014-10-17 14:56:58 +04:00
Vadim Pisarevsky
fa76c634ec
ok; all the tests now pass
2014-10-17 14:56:58 +04:00
Vadim Pisarevsky
01d3848f17
all the tests now pass except for MSER
2014-10-17 14:56:58 +04:00
Vadim Pisarevsky
162384a838
fixed several test failures; currently 9 out of 73 tests fail
2014-10-17 14:56:58 +04:00
Vadim Pisarevsky
06d4aa6060
now all the samples and opencv_contrib compile!
2014-10-17 14:56:58 +04:00
Vadim Pisarevsky
09df1a286b
OpenCV with the refactored features2d compiles! contrib is broken for now; the tests are not tried yet
2014-10-17 14:56:58 +04:00
Vadim Pisarevsky
2e915026a0
yet another attempt to refactor features2d; the first commit, features2d does not even compile
2014-10-17 14:56:58 +04:00
Vadim Pisarevsky
f6f839eb3c
trying to resolve the merge conflict
2014-10-17 14:46:08 +04:00
Vadim Pisarevsky
c5292c2549
fixed error in OpenCL ORB
2014-10-17 14:30:12 +04:00
Vadim Pisarevsky
c422bdc3f8
fixed some more compile errors and test failures
2014-10-17 14:22:02 +04:00
Vadim Pisarevsky
61cddd8b63
fixed opencv_java build
2014-10-16 22:52:04 +04:00
Vadim Pisarevsky
25a7d023dd
ok; all the tests now pass
2014-10-16 21:59:38 +04:00
Vadim Pisarevsky
c5261ea3d2
all the tests now pass except for MSER
2014-10-16 20:58:29 +04:00
Vadim Pisarevsky
97a5dd0ead
fixed several test failures; currently 9 out of 73 tests fail
2014-10-16 17:00:40 +04:00
Vadim Pisarevsky
d017faa06c
now all the samples and opencv_contrib compile!
2014-10-16 16:34:22 +04:00
Vadim Pisarevsky
e3654d5416
[move sift.cpp] refactored xfeatures2d in the same style as features2d
...
original commit: 0cfd795303
2014-10-16 16:33:21 +04:00
Alexander Alekhin
d92bee821d
Merge upstream branch
2020-04-21 06:20:05 +00:00
Alexander Alekhin
df10411e05
features2d(sift): patent expiration note
2020-04-21 06:19:16 +00:00
Alexander Alekhin
44e9fb306d
features2d(sift): code from nonfree module
2020-04-21 04:14:18 +00:00
Vadim Pisarevsky
5e667ee53a
OpenCV with the refactored features2d compiles! contrib is broken for now; the tests are not tried yet
2014-10-15 22:49:17 +04:00
Pavel Vlasov
45958eaabc
Implementation detector and selector for IPP and OpenCL;
...
IPP can be switched on and off on runtime;
Optional implementation collector was added (switched off by default in CMake). Gathers data of implementation used in functions and report this info through performance TS;
TS modifications for implementations control;
2014-10-15 14:24:41 +04:00
Vadim Pisarevsky
1796a26fc7
yet another attempt to refactor features2d; the first commit, features2d does not even compile
2014-10-13 23:01:45 +04:00
Vadim Pisarevsky
9575a82a9e
Merge pull request #3299 from felixendres:orb_keypoint_detector_threshold
2014-10-09 14:52:38 +00:00
Niklas Frisk
af72e6b8f4
Fixes #3910 , flags in _prepareImgAndDrawKeypoints are now binary OR'ed instead of added.
2014-10-07 09:40:56 +02:00
Felix Endres
ee6835492c
Exposing the FAST detector threshold for ORB
...
Implemented as a new optional parameter for
the constructor of the ORB detector. The
change of this parameter has been included
in the orb unit test.
2014-10-02 12:17:01 +02:00
Vadim Pisarevsky
df28bb5ccd
Merge pull request #3190 from StevenPuttemans:fix_simpleblobdetector
2014-09-23 07:18:01 +00:00
StevenPuttemans
d4ec359f11
Fixing errors
2014-09-22 22:12:27 +02:00
StevenPuttemans
03662c0589
fix blobdetector
2014-09-22 13:58:45 +02:00
Vadim Pisarevsky
3516e14e05
Merge branch 'bug_3172' of https://github.com/elmarb/opencv into bfmatcher_fix;
...
use different fix for the problem, embedded right into the BFMatcher.
2014-09-19 15:31:21 +04:00
E Braun
d82b918a7b
fix for bug 3172
2014-09-19 14:47:43 +04:00
E Braun
aa9da6e433
regression test for bug 3172
2014-09-19 14:47:43 +04:00
Vadim Pisarevsky
4057e27539
Merge pull request #3126 from avdmitry:move_KDTree_to_ml
2014-09-14 18:57:23 +00:00
E Braun
bdb82d181f
fix for bug 3172
2014-09-02 18:05:23 +02:00
Adrian Clark
fcc481e751
Fixed crash in SSE implementation of FREAK descriptor when number of pairs is set to something other than 512.
...
See http://code.opencv.org/issues/3889 for more details
2014-09-01 09:37:33 +12:00
Dmitriy Anisimov
5f3ee657ce
removed kdtree declaration from interface
2014-08-31 21:39:47 +04:00
Vadim Pisarevsky
2211cfe783
Merge pull request #3151 from PhilLab:orbNoKeypoints
2014-08-25 17:10:45 +00:00
Philipp Hasper
9b1136518c
ORB.cl : fixed redefinition of val
2014-08-23 19:07:14 +02:00
PhilLab
92826a0436
ORB crashed with no keypoints present
2014-08-23 14:02:15 +02:00
Vadim Pisarevsky
1efc3cff36
Merge pull request #3124 from f-morozov:optim_pr
2014-08-22 07:04:43 +00:00
f-morozov
0ae89fe2be
AKAZE optimizations
2014-08-21 09:34:52 +04:00
Vadim Pisarevsky
a223479107
Merge pull request #3099 from f-morozov:akaze_tutorial
2014-08-19 22:22:23 +00:00
f-morozov
886319c81d
AKAZE fixes and tracking tutorial
2014-08-19 16:35:20 +04:00
Dmitriy Anisimov
37b1a7560c
first version of moving KDTree from core to ml
2014-08-18 22:40:31 +04:00
Adil Ibragimov
8a4a1bb018
Several type of formal refactoring:
...
1. someMatrix.data -> someMatrix.prt()
2. someMatrix.data + someMatrix.step * lineIndex -> someMatrix.ptr( lineIndex )
3. (SomeType*) someMatrix.data -> someMatrix.ptr<SomeType>()
4. someMatrix.data -> !someMatrix.empty() ( or !someMatrix.data -> someMatrix.empty() ) in logical expressions
2014-08-13 15:21:35 +04:00
Vadim Pisarevsky
1629d50999
removed some more trailing whitespaces
2014-08-12 14:33:18 +04:00
Vadim Pisarevsky
bca4eb5e00
fixed more doc builder warnings
2014-08-12 10:40:23 +04:00
Vadim Pisarevsky
d119afafdb
removed the stuff that's now in xfeatures2d; temporarily added dummy definition of SIFT to make doc builder pass (will remove it later)
2014-08-12 00:30:06 +04:00
Vadim Pisarevsky
fe7b48aa8f
removed the stuff that's now in xfeatures2d; temporarily added dummy definition of SIFT to make doc builder pass (will remove it later)
2014-08-12 00:29:56 +04:00
Vadim Pisarevsky
27d2d3cbac
fixed doc builder complains and the test failures
2014-08-12 00:03:40 +04:00
Vadim Pisarevsky
31df47b6ea
moved nonfree and a part of features2d to opencv_contrib/xfeatures2d
2014-08-11 23:26:39 +04:00
mshabunin
c54b8f9b00
Merge remote-tracking branch 'master' into stitch-fix
...
* 'master' of github.com:itseez/opencv: (82 commits)
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
added some basic functionality needed by the new face module (moved from the old "contrib")
moved to the new opencv_contrib/face module
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
Fixed review comment from Vadim Pisarevsky
modified farneback sample to use T-API
ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
small fix for GaussianBlur ocl test
fix binary package build
small fix for ocl_resize
fix IOS framework
fixed test ocl_MatchTemplate for sparse matrix
Fixed typos
fixing error, wrong template method param.
fixing Mac build
some formal changes (generally adding constness)
Fixed choice of kercn and rowsPerWI for non-Intel device.
fixed nDiffs for CalcBackProject
fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
...
Conflicts:
modules/core/include/opencv2/core/mat.inl.hpp
2014-08-11 14:50:08 +04:00
Vadim Pisarevsky
05e7c29de5
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
2014-08-10 00:10:05 +04:00
Adil Ibragimov
98d5731ad8
some formal changes (generally adding constness)
2014-08-07 15:49:14 +04:00
Alexander Alekhin
55188fe991
world fix
2014-08-05 20:12:35 +04:00
Roman Donchenko
983e75e5de
Merge remote-tracking branch 'origin/master' into merge-2.4
2014-08-01 15:01:41 +04:00
E Braun
bbe48eaac6
regression test for bug 3172
2014-08-01 00:17:17 +02:00
f-morozov
7f82960897
AKAZE fixes, tests and tutorial
2014-07-30 18:02:08 +04:00
PhilLab
d5489f3a68
Clarified DescriptorExtractor::compute
2014-07-18 10:57:54 +02:00
Roman Donchenko
a3bde36c84
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/contrib/doc/facerec/facerec_api.rst
modules/contrib/include/opencv2/contrib/contrib.hpp
modules/contrib/src/facerec.cpp
modules/core/include/opencv2/core/mat.hpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/highgui/src/loadsave.cpp
modules/imgproc/src/pyramids.cpp
modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp
modules/python/src2/gen.py
modules/python/test/test.py
modules/superres/test/test_superres.cpp
samples/cpp/facerec_demo.cpp
2014-07-08 14:33:56 +04:00
vbystricky
4286f60387
Extract imgcodecs module from highgui
2014-07-07 16:28:08 +04:00
berak
3500c940d4
add Bag of Words to python wrapper
2014-06-11 11:50:22 +02:00
Ilya Lavrenov
556206de2d
fixed defects found by coverity scan
2014-06-10 13:14:51 +04:00
berak
fc610979bb
export BOW to script wrappers
2014-06-07 16:34:53 +02:00
Alexander Alekhin
776728ef2a
KAZE: disable tests (too many crashes)
2014-05-29 23:12:48 +04:00
Vadim Pisarevsky
8bd1efa523
Merge pull request #2673 from BloodAxe:kaze
2014-05-19 17:35:22 +04:00
Ievgen Khvedchenia
12e1d7fc2b
Fix "WARNING: Block quote ends without a blank line"
2014-05-13 21:07:30 +03:00
Ievgen Khvedchenia
87972d0d7c
Fix "WARNING: Block quote ends without a blank line"
2014-05-13 13:15:24 +03:00
Ievgen Khvedchenia
03db61b33b
FixFix documentation warnings
2014-05-10 23:06:23 +03:00
Ievgen Khvedchenia
029a8c443a
Remove GSURF descriptor from KAZE algorithm
2014-05-10 20:57:37 +03:00
Ievgen Khvedchenia
a068ccbf51
Fix "Title underline too short" warning
2014-05-09 22:53:28 +03:00
Ievgen Khvedchenia
616c348536
Fix documentation warnings
2014-05-09 22:31:20 +03:00
Ievgen Khvedchenia
3a8e15fad9
Fix documentation warnings
2014-05-09 22:21:26 +03:00
Ievgen Khvedchenia
c4e49463a9
Initial commit of the KAZE & AKAZE docs
2014-05-09 19:35:41 +03:00
Ievgen Khvedchenia
b42c268164
Temporary remove of CV_WRAP
2014-05-09 19:34:54 +03:00
Ievgen Khvedchenia
1a5fcd715d
Refactor of KAZE and AKAZE:
...
1) Clean-up from the unused code
2) Remove of SURF extraction method
3) Enabled threading for KAZE extraction
4) Exposed new properties for runtime configuration
2014-05-09 18:46:00 +03:00
Ievgen Khvedchenia
220de14077
Clean-up from the dead code
2014-05-05 21:48:54 +03:00
Ievgen Khvedchenia
e7e00201f1
Enabled parallel processing of the nld_step_scalar function
2014-05-02 14:07:30 +03:00
Ievgen Khvedchenia
9fc90f4069
Merged nldiffusion functions into one module with removal of duplicate functions
2014-05-01 22:24:15 +03:00
Ievgen Khvedchenia
2df7242646
Prepare to merge KAZE and AKAZE nldiffusion_functions source files (work in progress).
2014-05-01 18:27:24 +03:00
Ievgen Khvedchenia
30f73623ce
Replace runtime checks with assertions
2014-05-01 18:24:13 +03:00
Ievgen Khvedchenia
3e51da38fb
Removed Feature_Suppression_Distance function that is not used anywhere.
2014-05-01 10:58:34 +03:00
Ievgen Khvedchenia
ab1ef08f0e
Rename file config.h to KAZEConfig.h
2014-04-29 22:17:18 +03:00
Ievgen Khvedchenia
4509fe55c2
Clean-up of getters/setters that are not needed by OpenCV
2014-04-29 21:39:27 +03:00
Ievgen Khvedchenia
2daa14e3c7
Clean-up from dead code.
2014-04-29 21:07:53 +03:00
Ievgen Khvedchenia
a134e068ef
Fix wrong checking of returned descriptor type
2014-04-28 22:25:27 +03:00
Ievgen Khvedchenia
c1bf453266
Wrapped nldiffusion functions with details::kaze or details::amaze namespace to avoid collision of function names
2014-04-28 20:41:44 +03:00
Ievgen Khvedchenia
c68cbfced3
Fix size_t to int conversion
2014-04-28 19:32:29 +03:00
Ievgen Khvedchenia
0e3bbd7026
Fix "conditional expression constant" warning
2014-04-28 19:32:04 +03:00
Ievgen Khvedchenia
a941d25f6d
Fix size_t to int conversion
2014-04-28 16:46:09 +03:00
Ievgen Khvedchenia
5662294319
Rename KAZE to KAZEFeatures to fix MSVS x64 compiler error (Duplicate file name confused it)
2014-04-28 16:34:35 +03:00
Ievgen Khvedchenia
599bcfb591
Fix size_t to int conversion
2014-04-28 16:24:35 +03:00
Ievgen Khvedchenia
cc0a94c536
Fix "conditional expression constant" warning
2014-04-28 16:23:58 +03:00
Ievgen Khvedchenia
2162aab0e9
Remove AKAZEFeatures desctructor
2014-04-28 15:17:09 +03:00
Ievgen Khvedchenia
f9d3c49023
Bugfix: wrong variable name
2014-04-28 15:14:03 +03:00
Ievgen Khvedchenia
f9422f60a6
Fix Fix casting from/to int/float that caused lot of compiler warnings.
2014-04-28 15:13:42 +03:00
Ievgen Khvedchenia
3c596184e4
Added copyright headers for KAZE and AKAZE wrappers
2014-04-28 15:01:42 +03:00
Ievgen Khvedchenia
f97e38d8a6
Fix casting from/to int/float that caused lot of compiler warnings.
2014-04-28 15:00:14 +03:00
Ievgen Khvedchenia
61f79c2632
Fix line ending at EOF
2014-04-28 10:53:09 +03:00
Ievgen Khvedchenia
3cfc22ae4e
Fix initialisation order of parallel loop classes for AKAZE descriptor extraction
2014-04-28 10:52:05 +03:00
Ievgen Khvedchenia
f3f0e06c4d
Fix parenthesis in assert statements
2014-04-28 10:51:09 +03:00
Ievgen Khvedchenia
0e243541f9
Fix shadowed variable warnings
2014-04-28 10:50:46 +03:00
Ievgen Khvedchenia
ba5bec1de2
Fix mutable compilation error
2014-04-27 23:07:48 +03:00
Ievgen Khvedchenia
eada0f4b48
Fix shadowed i variable warning
2014-04-27 23:04:31 +03:00
Ievgen Khvedchenia
503bd38963
Enable multithreaded extraction of features using cv::parallel_for_
2014-04-27 22:28:18 +03:00
Ievgen Khvedchenia
d37220e8ff
Clean-up of the iostream manipulator in AKAZEConfig.
2014-04-26 23:34:38 +03:00
Ievgen Khvedchenia
d8c9bb777e
Fix return value of descriptorType()
2014-04-26 23:34:07 +03:00
Ievgen Khvedchenia
86888bdf77
Replace swap with clear (more efficient)
2014-04-24 22:01:45 +01:00
Ievgen Khvedchenia
3e24822fff
Bugfix: clear input vector of key points for detection stage
2014-04-24 22:01:29 +01:00
Ievgen Khvedchenia
33b9e4b4a3
Added missing operator()
2014-04-24 22:00:51 +01:00
Ievgen Khvedchenia
36db97068c
Added missing operator()
2014-04-24 22:00:37 +01:00
Ievgen Khvedchenia
6d500cc6f7
Merge KAZE and AKAZE features with most recent version
2014-04-23 23:02:02 +01:00
Ievgen Khvedchenia
d27ed856f2
Replace config with AKAZEConfig.h
2014-04-23 22:44:03 +01:00
Andrey Pavlenko
dab8e920b0
Merge pull request #2565 from apavlenko:tapi_stitching
2014-04-15 19:56:11 +04:00
Roman Donchenko
799d2dabd6
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/test/test_arithm.cpp
modules/cuda/src/cascadeclassifier.cpp
modules/imgproc/doc/geometric_transformations.rst
modules/objdetect/src/hog.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/moments.cpp
2014-04-14 16:08:02 +04:00
Alexander Alekhin
e6cc1be7e8
stitching: allow to use dynamic DescriptorMatcher
2014-04-11 13:01:13 +04:00
Alexander Alekhin
89e3e448f5
features2d: workaround for 'utrainDescCollection' issue (PR #2142 )
2014-04-11 13:01:07 +04:00
Vadim Pisarevsky
f417c79d16
Merge pull request #1932 from seth-planet:master
2014-04-10 13:36:14 +04:00
Maks Naumov
eb89f5207c
remove unused variables in CV_KDTreeTest_CPP::findNeighbors()
2014-04-09 23:07:48 +03:00
Ilya Lavrenov
aa5326c231
cv::norm -> cvtest::norm in tests
...
Conflicts:
modules/core/src/stat.cpp
2014-04-08 14:49:20 +04:00
Ievgen Khvedchenia
5848e75168
Clean-up from unused utils.h/utils/cpp
2014-04-05 15:25:59 +03:00
Ievgen Khvedchenia
17f305140b
Added unit-tests for KAZE and AKAZE features
2014-04-05 10:25:59 +03:00
Ievgen Khvedchenia
137ff7eccb
Added KAZE and AKAZE wrappers
2014-04-05 10:25:46 +03:00
Ievgen Khvedchenia
703e012a5b
Prepare KAZE and AKAZE sources for integration
2014-04-05 10:24:27 +03:00
Ievgen Khvedchenia
7a59435490
KAZE and AKAZE integration initial commit
2014-04-04 14:25:38 +03:00
Roman Donchenko
c165f07319
Merge pull request #2550 from SpecLad:merge-2.4
2014-04-02 12:00:01 +04:00
Andrey Pavlenko
6c2d77079f
Merge pull request #2487 from ilya-lavrenov:tapi_perf_orb
2014-03-31 18:17:50 +04:00
Ilya Lavrenov
c53398a438
performance tests for FAST
2014-03-31 15:03:00 +04:00
Roman Donchenko
f77c68e0fa
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/imgproc/src/opencl/integral_sqrsum.cl
modules/nonfree/doc/feature_detection.rst
modules/nonfree/include/opencv2/nonfree/ocl.hpp
modules/nonfree/src/surf_ocl.cpp
modules/nonfree/test/test_features2d.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/match_template.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/opencl/haarobjectdetect_scaled2.cl
modules/ocl/test/test_imgproc.cpp
2014-03-31 14:42:00 +04:00
Roman Donchenko
4382970739
Merge pull request #2540 from mjul:fixtypos_2.4
2014-03-28 11:58:11 +04:00
Martin Jul
a1798cb28e
Fixed typo in BFMatcher in docs.
2014-03-27 13:52:49 +01:00
Ilya Lavrenov
80df44bd75
doc fix
2014-03-27 16:30:29 +04:00
Roman Donchenko
491b84d463
Merge pull request #2478 from clemenscorny:master
2014-03-26 12:19:54 +04:00
Clemens Korner
f1c8b4b965
FEATURES2D: add DenseFeatureDetector Python wrapper
2014-03-25 12:07:01 +01:00
Andrey Pavlenko
6b434befc9
Merge pull request #2480 from vpisarev:ocl_orb
2014-03-14 19:04:19 +04:00
Ilya Lavrenov
b47bec2ed0
performance tests for ORB
2014-03-13 23:30:02 +04:00
Vadim Pisarevsky
4fafab3786
fixed extra whitespace
2014-03-13 23:18:41 +04:00
Vadim Pisarevsky
42e604abea
fixed bug in FAST
2014-03-13 23:17:28 +04:00
Vadim Pisarevsky
3e854fa6e5
finished OpenCL port of ORB
2014-03-13 22:56:53 +04:00
Roman Donchenko
95a55453df
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/perf/perf_pnp.cpp
modules/contrib/src/imagelogpolprojection.cpp
modules/contrib/src/templatebuffer.hpp
modules/core/perf/opencl/perf_gemm.cpp
modules/cudafeatures2d/doc/feature_detection_and_description.rst
modules/cudafeatures2d/perf/perf_features2d.cpp
modules/cudafeatures2d/src/fast.cpp
modules/cudafeatures2d/test/test_features2d.cpp
modules/features2d/doc/feature_detection_and_description.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/imgproc/perf/opencl/perf_blend.cpp
modules/imgproc/perf/opencl/perf_color.cpp
modules/imgproc/perf/opencl/perf_moments.cpp
modules/imgproc/perf/opencl/perf_pyramid.cpp
modules/objdetect/perf/opencl/perf_hogdetect.cpp
modules/ocl/perf/perf_arithm.cpp
modules/ocl/perf/perf_bgfg.cpp
modules/ocl/perf/perf_blend.cpp
modules/ocl/perf/perf_brute_force_matcher.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/perf/perf_gftt.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_imgwarp.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_matrix_operation.cpp
modules/ocl/perf/perf_ml.cpp
modules/ocl/perf/perf_moments.cpp
modules/ocl/perf/perf_opticalflow.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/video/src/lkpyramid.cpp
modules/video/src/precomp.hpp
samples/gpu/morphology.cpp
2014-03-11 17:20:01 +04:00
Vadim Pisarevsky
efdfca7a11
do not use the large "score" buffer; now without non-max suppression OpenCL FAST is pretty efficient
2014-03-07 18:55:45 +04:00
Vadim Pisarevsky
06c138bd64
make the correctness test pass
2014-03-07 18:18:10 +04:00
sprice
75ed2f52f1
Merge branch 'master' of https://github.com/Itseez/opencv
...
Conflicts:
modules/features2d/include/opencv2/features2d.hpp
modules/features2d/src/freak.cpp
modules/features2d/src/stardetector.cpp
2014-03-06 15:39:06 -08:00
Vadim Pisarevsky
8e1918e86e
added OpenCL-accelerated(?) FAST; for now the tests fail :(
2014-03-06 18:04:04 +04:00
Ilya Lavrenov
099ea91823
typos
2014-03-04 12:47:40 +04:00
Ilya Lavrenov
32eb38ec98
fixed defects from coverity.com
2014-02-23 20:21:08 +04:00
Andrey Pavlenko
ff9a0815b9
Merge pull request #2352 from ilya-lavrenov:flann
2014-02-18 13:24:41 +04:00
Ilya Lavrenov
6ad7b64912
some more changes
2014-02-17 21:57:33 +04:00
Roman Donchenko
a0bb74a086
Merge pull request #2337 from pmoulon:master
2014-02-17 12:24:48 +04:00
Roman Donchenko
cfcf07acfa
Merge pull request #2328 from rohitgirdhar:bugfix_blobdetector_kpt_radius
2014-02-17 12:23:59 +04:00
Ilya Lavrenov
f74ef644bc
changed the signature of add method according to the base class
2014-02-17 02:39:38 +04:00
yash
1a89a03c7c
Fixed CV_ASSERT condition in the code for bag of words
2014-02-16 22:33:30 +05:30
Pierre Moulon
8829e9f6c8
Fix a typo error
2014-02-14 12:22:53 +01:00
Rohit Girdhar
a4b5641836
bugfix: blobdetector was putting incorrect diameter value in keypoints
2014-02-12 22:29:04 +05:30
Andrey Pavlenko
b6675ee2a8
Merge pull request #2278 from KonstantinMatskevich:ocl_toinputarray
2014-02-06 12:55:04 +04:00
Konstantin Matskevich
bdfa9fa14a
fixes2
2014-02-05 13:51:14 +04:00
Konstantin Matskevich
1aa83d324b
fixed docs2
2014-02-05 11:32:35 +04:00
Konstantin Matskevich
eb4c2cd59f
removed CV_IN/OUT
2014-02-05 10:55:26 +04:00
Konstantin Matskevich
a0ccb46a7f
fixed docs
2014-02-05 10:49:56 +04: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
Vadim Pisarevsky
8d5e952263
very preliminary port of SURF to T-API (compiles but certainly does not work)
2014-02-04 03:21:03 +04:00
Andrey Pavlenko
5894f82f14
Merge pull request #2202 from ilya-lavrenov:tapi_GFTTDetector
2014-01-31 19:22:18 +04:00
Andrey Pavlenko
06acf7090c
Merge pull request #2027 from AD-530:brief_cl
2014-01-27 09:49:46 +04:00
Ilya Lavrenov
9968197ebf
doc fix
2014-01-25 14:44:28 +04:00
Ilya Lavrenov
e559256719
added cv::GFTTDetector
2014-01-25 00:23:59 +04:00
Konstantin Matskevich
133f91f3f2
added perf test
2014-01-23 07:51:19 +04:00
Konstantin Matskevich
2f8c29a1f0
removed unnecessary functions and variables
2014-01-22 15:31:27 +04:00
Konstantin Matskevich
3b7683e72f
fixed docs
2014-01-22 15:31:26 +04:00
Konstantin Matskevich
ca5689e0db
BFMatcher
...
match
radiusMatch
2014-01-22 15:31:26 +04:00
Andrey Pavlenko
4fbd2ef87a
Merge pull request #1290 from mbarnach:bow_desc
2014-01-21 19:22:47 +04:00
Matthias Bady
67e2d7ec43
Merge branch 'master' of https://github.com/Itseez/opencv into brief_cl
2014-01-18 10:38:07 +01:00
Roman Donchenko
fee2ed37fc
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/core/include/opencv2/core/mat.hpp
modules/core/src/algorithm.cpp
modules/core/src/arithm.cpp
modules/features2d/src/features2d_init.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/imgproc/src/generalized_hough.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/video/src/tvl1flow.cpp
modules/video/src/video_init.cpp
2014-01-14 11:53:59 +04:00
Ilya Lavrenov
6b9ebcbf3d
deleted extra semicolons
2014-01-07 02:52:30 +04:00
Matthias Bady
9b0a9f2a24
moved documentation of BriefDescriptorExtractor to correct place
2013-12-20 10:57:48 +01:00
Roman Donchenko
e49b8dee40
Merge pull request #1881 from pentschev:defaultNorm_master
2013-12-17 13:53:59 +04:00
Roman Donchenko
52a785e95a
Merge pull request #1996 from SpecLad:merge-2.4
2013-12-17 13:21:48 +04:00
Roman Donchenko
9d8d70d6ca
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/features2d/src/freak.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/test/test_api.cpp
2013-12-16 15:02:12 +04:00
StevenPuttemans
e4b41d38f1
Fixed descripotorsCount to descriptorsCount
...
See feature 2862
2013-12-16 10:47:24 +01:00
sprice
1c15776cf5
Merge branch 'master' of https://github.com/Itseez/opencv
...
Conflicts:
modules/imgproc/src/sumpixels.cpp
2013-12-11 14:35:51 -08:00
Peter Andreas Entschev
c289c8a700
Fixing some indentation issues on FREAK source file.
2013-12-10 08:57:46 -02:00
Roman Donchenko
464a010f53
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/operations.hpp
modules/core/include/opencv2/core/version.hpp
modules/core/src/gpumat.cpp
modules/cudaimgproc/src/color.cpp
modules/features2d/src/orb.cpp
modules/imgproc/src/samplers.cpp
modules/ocl/include/opencv2/ocl/matrix_operations.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
samples/ocl/facedetect.cpp
2013-12-10 12:51:00 +04:00
Peter Andreas Entschev
6f3163f62d
DescriptorExtractor: added defaultNorm() to return default norm type.
...
Added the defaultNorm() method to the DescriptorExtractor class. This method returns the default norm type for each descriptor type. The tests and C/C++ samples were updated to get the norm type directly from the DescriptorExtractor inherited classes.
This was reported in feature report #2182 (http://code.opencv.org/issues/2182 ). It will make it possible to get the norm type usually applied matching method for each descriptor, instead of passing it manually.
2013-12-09 09:54:42 -02:00
sprice
73b0827ec1
Don't automatically convert to grayscale (keep previous behavior.)
2013-12-04 18:21:56 -08:00
sprice
2cc11e2c6a
Updating STAR detector and FREAK descriptor to work with large and/or 16-bit images
2013-12-04 18:13:34 -08:00
Andrey Pavlenko
1966e7cea9
fixing compilation on Linux
2013-12-03 17:46:09 +04:00
Andrey Pavlenko
bd9d3dd561
fixing build of 2.4 branch with VC12 (aka 2013)
...
(master branch was fixed before, no need to merge this to master!)
- disable openexr (numerous undefined std::min & std::max)
- workaround for two compilator bugs
2013-12-03 13:16:44 +04:00
Mathieu Barnachon
fb9c59dd8d
Fix default argument.
2013-11-27 18:14:37 +01:00
Mathieu Barnachon
b413bcbba4
Fix shadow parameter.
2013-11-27 11:36:34 +01:00
Mathieu Barnachon
99c8b8c016
Fix parameter name to fit documentation.
2013-11-27 11:06:52 +01:00
Mathieu Barnachon
4f74e2509b
Fix the documentation names.
2013-11-26 22:50:26 +01:00
Mathieu Barnachon
c90fe65f22
Fix compilation issue related to previous commit.
2013-11-24 17:16:45 +01:00
Mathieu Barnachon
e8b86c8663
Fix name of one parameter to fit the documentation.
2013-11-24 17:14:23 +01:00
Mathieu Barnachon
9dc713eaba
Fix name of parameter to have proper documentation.
2013-11-24 15:45:05 +01:00
Mathieu Barnachon
bf84d476fc
Fix useless space...
2013-11-24 15:38:48 +01:00
Mathieu Barnachon
0c4da123e9
Remove duplicate functions.
2013-11-24 14:33:41 +01:00
Mathieu Barnachon
67525627db
Merge remote-tracking branch 'upstream/master' into bow_desc
...
Conflicts:
modules/features2d/src/bagofwords.cpp
2013-11-24 14:21:44 +01:00
Jose-Luis Blanco-Claraco
80e667b647
Minimized the number of arguments required to workaround the MSVC2013 compiler bug.
2013-10-21 21:43:26 +02:00
Jose-Luis Blanco-Claraco
77023e2366
Added comment to features2d_init.cpp explaining the reason for the extra parameters.
2013-10-21 21:17:15 +02:00
Jose-Luis Blanco-Claraco
c33ca77838
Undo changing whitespace.
2013-10-21 15:59:26 +02:00
Jose-Luis Blanco-Claraco
bec35eeddb
Avoid duplicated variable declarations.
2013-10-21 15:57:11 +02:00
Jose-Luis Blanco-Claraco
52a904e17b
Fixed MSVC 2013 build errors and workaround for an internal compiler crash.
2013-10-20 17:28:45 +02:00
Ilya Lavrenov
35d9ce0c0c
fixed warnings
2013-10-08 12:46:43 +04:00
Roman Donchenko
bcb6f0386e
Named FastFeatureDetector::Type to allow its use in makePtr.
...
It has actually worked before (likely because it's inside a class),
but C++03 does disallow unnamed types as template arguments,
and there's a report that at least in one version of GCC it's
enforced: <http://code.opencv.org/issues/3278 >.
2013-10-01 18:22:03 +04:00
Alexander Alekhin
0ee47502d9
remove CV_EXPORT from templates
2013-09-15 13:48:54 +04:00
Roman Donchenko
1eacb485c5
Boring changes - features2d.
2013-09-05 18:26:44 +04:00
Mathieu Barnachon
464985205c
Update PR after mdim review.
2013-09-05 16:05:54 +12:00
Roman Donchenko
9ed475cf52
War on Whitespace, master edition: file endings.
2013-08-27 14:23:26 +04:00
Roman Donchenko
9b92545ce6
War on Whitespace, master edition: trailing spaces.
2013-08-27 13:57:24 +04:00
Roman Donchenko
2c4bbb313c
Merge commit '43aec5ad' into merge-2.4
...
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
2013-08-27 13:26:44 +04:00
Roman Donchenko
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +04:00
Roman Donchenko
f76dd99299
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVModule.cmake
doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
doc/tutorials/features2d/feature_detection/feature_detection.rst
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
doc/tutorials/features2d/feature_homography/feature_homography.rst
modules/core/include/opencv2/core/operations.hpp
modules/core/src/arithm.cpp
modules/gpu/perf/perf_video.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/java/generator/src/cpp/VideoCapture.cpp
modules/nonfree/src/opencl/surf.cl
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/color.cpp
modules/ocl/src/filtering.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_objdetect.cpp
modules/python/src2/cv2.cpp
samples/gpu/CMakeLists.txt
samples/gpu/super_resolution.cpp
2013-08-19 19:02:36 +04:00
Mathieu Barnachon
43c9818895
Adding class for BOW image matcher (Feature #3005 ).
...
Same prototype as BOWImgDescriptorExtractor, but do only the matching.
If the feature is accepted, the BOWImgDescriptorExtractor and BOWImgDescriptorMatcher should probably refactor with inheritance.
Add a class to compute the keypoints, descriptors and matching from an image should be added to.
2013-08-18 11:32:04 +12:00
Roman Donchenko
2530b580a8
Merge branch 'master' into merge-2.4
...
Conflicts:
modules/photo/doc/inpainting.rst
2013-08-16 14:14:12 +04:00
Roman Donchenko
8e245f8a3a
Merge pull request #1186 from SpecLad:dont-export-templates
2013-08-14 17:25:01 +04:00
Roman Donchenko
6b5ac42a9b
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/object_categorization.rst
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/object_detection.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/samplers.cpp
modules/ml/doc/k_nearest_neighbors.rst
modules/nonfree/doc/feature_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/photo/doc/inpainting.rst
modules/ts/include/opencv2/ts.hpp
platforms/scripts/camera_build.conf
samples/android/camera-calibration/AndroidManifest.xml
2013-08-13 12:56:39 +04:00
Roman Donchenko
d9f71b762f
Deleted almost all of the precomp.cpp files.
...
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
2013-08-08 12:43:07 +04:00
StevenPuttemans
ed76b2f98f
Like mentioned by Andrei Pavlenko after merging pullrequest #1206 , a wrong
...
ReST directive was used. Also fixed some other ReST directives that were
not correct and removed some warnings during buildbot checks.
2013-08-07 14:49:33 +02:00
Roman Donchenko
2f780ed994
Fix whitespace errors.
2013-08-06 18:07:00 +04:00
Roman Donchenko
dcaf923517
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/ffmpeg/ffmpeg_version.cmake
cmake/OpenCVFindLibsGrfmt.cmake
cmake/templates/cvconfig.h.cmake
modules/bioinspired/doc/retina/index.rst
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/calib3d/src/precomp.hpp
modules/contrib/src/inputoutput.cpp
modules/contrib/src/precomp.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/types_c.h
modules/core/src/drawing.cpp
modules/core/src/precomp.hpp
modules/core/src/system.cpp
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
modules/features2d/doc/common_interfaces_of_feature_detectors.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/src/precomp.hpp
modules/flann/src/precomp.hpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/src/precomp.hpp
modules/gpu/test/test_imgproc.cpp
modules/highgui/CMakeLists.txt
modules/highgui/test/test_precomp.hpp
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/precomp.hpp
modules/java/generator/src/cpp/Mat.cpp
modules/legacy/src/precomp.hpp
modules/ml/doc/k_nearest_neighbors.rst
modules/ml/src/precomp.hpp
modules/nonfree/doc/feature_detection.rst
modules/nonfree/src/precomp.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
modules/objdetect/src/cascadedetect.cpp
modules/objdetect/src/hog.cpp
modules/objdetect/src/precomp.hpp
modules/objdetect/test/test_latentsvmdetector.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/opencl/objdetect_hog.cl
modules/ocl/src/precomp.hpp
modules/photo/src/precomp.hpp
modules/stitching/src/precomp.hpp
modules/superres/perf/perf_precomp.hpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
modules/superres/test/test_precomp.hpp
modules/ts/include/opencv2/ts.hpp
modules/video/src/precomp.hpp
modules/videostab/src/precomp.hpp
modules/world/src/precomp.hpp
2013-08-06 13:56:49 +04:00
StevenPuttemans
f28496c628
Added sample links in documentation for python2, ocl and gpu
2013-08-02 14:05:08 +02:00
Andrey Pavlenko
6a40067424
Merge pull request #1206 from StevenPuttemans:feature_3169
2013-07-31 14:31:21 +04:00
StevenPuttemans
0c5244103f
Added all *.cpp samples reference to the 2.4.6 documentation as discussed in feature #3169
...
- Used lunix style slashes - works on most systems
- Removed all trailing whitespaces
2013-07-31 11:20:05 +02:00
Andrey Pavlenko
6a77bfb503
Merge pull request #1172 from StevenPuttemans:bugfix_3166_24
2013-07-30 18:39:41 +04:00
Andrey Pavlenko
f7ce70f70a
Merge pull request #1110 from SpecLad:config-cleanup
2013-07-30 17:39:35 +04:00
Roman Donchenko
4ac2db271d
Removed CV_EXPORTS from all template classes (that I could find).
...
It doesn't make sense to export template classes, since there's no way
the user can learn that it can import them. In fact, it is somewhat
deleterious, because every module will export every instantiation
that it uses, but doesn't inline.
2013-07-25 19:40:08 +04:00
Alexander Mordvintsev
57bd485119
compute method for Feature2D
2013-07-25 16:22:31 +04:00
Alexander Pacha
0b15cfd48c
Added FREAK-descriptor extractor to documentation.
...
Previously it was missing.
Ordered all descriptors by year of first publication.
2013-07-25 16:40:09 +12:00
StevenPuttemans
194af062ff
Adapted the reference underscore to link properly
2013-07-23 09:49:09 +02:00
StevenPuttemans
a92feafc49
Fixed bug 3166 - added paper reference to stardetector code
2013-07-23 08:49:25 +02:00
Roman Donchenko
3939d78336
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/types_c.h
modules/gpu/src/cuda/imgproc.cu
modules/gpu/src/cuda/safe_call.hpp
modules/gpu/src/error.cpp
modules/gpu/src/imgproc.cpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/shapedescr.cpp
modules/python/src2/cv2.cpp
modules/python/src2/cv2.cv.hpp
2013-07-22 18:38:57 +04:00
StevenPuttemans
52bfa7b850
Fixed bug 1873 : return image keypoint descriptors + fix on line 152 pure declaration
2013-07-19 09:29:48 +02:00
Roman Donchenko
feaa12a274
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/version.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/initialization.cpp
modules/ocl/test/main.cpp
modules/superres/CMakeLists.txt
modules/superres/src/input_array_utility.cpp
modules/superres/src/input_array_utility.hpp
modules/superres/src/optical_flow.cpp
2013-07-16 11:52:41 +04:00
abidrahmank
1923d87f61
PyDocs for common interface of feature2d
2013-07-11 09:33:32 +05:30
abidrahmank
f91f369788
PyDocs for FAST, ORB etc
2013-07-11 09:32:49 +05:30
abidrahmank
2047838106
feature2d drawing functions PyDocs
2013-07-11 09:31:25 +05:30
abidrahmank
5d863f7516
drawMatches python bindings
2013-07-11 09:28:37 +05:30
Roman Donchenko
894b30b34d
Merge pull request #1088 from apacha:brisk_noDescriptors_fix
2013-07-10 18:18:31 +04:00
Roman Donchenko
ac39bfb4cc
Remove HAVE_CVCONFIG_H - it's always defined.
2013-07-10 16:02:07 +04:00
Roman Donchenko
c05bfe9d6d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/ocl/src/opencl/stereobp.cl
modules/ocl/src/stereobp.cpp
2013-07-08 18:47:38 +04:00
Alexander Mordvintsev
3677a66403
line realign
2013-07-04 17:43:38 +04:00
Alexander Pacha
eaa29110e1
Fixed issue 3130 ( http://code.opencv.org/issues/3130 ), where one argument of the BRISK-call was ignored. Previously it was not possible to use BRISK without creating descriptors.
...
Now it behaves like ORB (and how it is documented), and you can call BRISK to just generate feature points and no descriptors.
2013-07-04 16:36:29 +12:00
Alexander Mordvintsev
8045093cfb
GFTT wrapped to python
2013-07-03 22:26:18 +04:00