Vadim Pisarevsky
b9792fdc14
Merge pull request #3829 from ippei-i:2.4-flann-lsh-addable-index
2015-05-18 15:38:21 +00:00
Vadim Pisarevsky
d705c651f2
Merge pull request #3960 from ilya-lavrenov:aarch64_test_fixes
2015-04-28 10:48:33 +00: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
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
Vadim Pisarevsky
03df7831ab
Merge pull request #3514 from mshabunin:compat-24
2014-12-22 10:38:56 +00: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
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
Niklas Frisk
af72e6b8f4
Fixes #3910 , flags in _prepareImgAndDrawKeypoints are now binary OR'ed instead of added.
2014-10-07 09:40:56 +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
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
E Braun
bbe48eaac6
regression test for bug 3172
2014-08-01 00:17:17 +02:00
PhilLab
d5489f3a68
Clarified DescriptorExtractor::compute
2014-07-18 10:57:54 +02:00
berak
3500c940d4
add Bag of Words to python wrapper
2014-06-11 11:50:22 +02:00
berak
fc610979bb
export BOW to script wrappers
2014-06-07 16:34:53 +02:00
Maks Naumov
eb89f5207c
remove unused variables in CV_KDTreeTest_CPP::findNeighbors()
2014-04-09 23:07:48 +03: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
Ilya Lavrenov
099ea91823
typos
2014-03-04 12:47:40 +04:00
Ilya Lavrenov
6b9ebcbf3d
deleted extra semicolons
2014-01-07 02:52:30 +04:00
Peter Andreas Entschev
c289c8a700
Fixing some indentation issues on FREAK source file.
2013-12-10 08:57:46 -02: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
Alexander Alekhin
0ee47502d9
remove CV_EXPORT from templates
2013-09-15 13:48:54 +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
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
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
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