Andrey Kamaev
dc0788c864
Merge branch 2.4
2013-01-17 18:39:20 +04:00
Alexander Smorkalov
8cb0343f4c
Documentation build warning fixes.
...
Invalid links and refences fixed.
SpaeseMat class documentation updated.
2013-01-14 17:58:27 +04:00
Anatoly Baksheev
a09b973c2e
Smart operators for smart Ptr (feature #2637 )
2013-01-07 22:33:12 +04:00
Andrey Kamaev
13b6a3a15e
Merge branch 2.4
2012-12-24 17:10:07 +04:00
Andrey Kamaev
524bde2aeb
Merge pull request #255 from taka-no-me:fix_batchdist_test
2012-12-24 13:29:32 +04:00
Andrey Kamaev
b870b246e1
Fix memory corruption in batchDistance perf tests
2012-12-22 21:01:57 +04:00
Andrey Kamaev
9944282b09
Fix build with STLPort from NDK r8d
2012-12-22 00:59:56 +04:00
Anatoly Baksheev
94c310fc14
added Ptr::operator==
2012-12-15 22:48:50 +04:00
Andrey Kamaev
e10ee89ec4
Merge branch 2.4
2012-11-30 19:54:24 +04:00
Anna Kogan
4e21f42714
increased time-limits
2012-11-28 18:17:33 +04:00
Anna Kogan
8877066846
increased time-limits
2012-11-28 18:17:33 +04:00
Andrey Kamaev
9719ea93b6
Merge branch 2.4
2012-11-13 19:54:48 +04:00
Andrey Kamaev
a126532cb7
Fix OS X build warnings
2012-11-09 11:29:52 +04:00
Andrey Kamaev
4d059e9e5b
Merge release 2.4.3
2012-11-02 17:58:02 +04:00
Andrey Kamaev
4ac5223afa
Merge pull request #131 from taka-no-me/tegra-fast
2012-11-02 14:31:02 +04:00
Andrey Kamaev
63ee26adda
Merge pull request #127 from cuda-geek/apple2clang
2012-11-02 14:29:39 +04:00
Andrey Kamaev
dbb5a32453
Use Tegra version of cv::FAST
2012-11-02 13:16:16 +04:00
marina.kolpakova
7a5b9a6b7f
replase __APPLE__ marco with __clang__
2012-11-01 19:34:05 +04:00
Andrey Kamaev
e3be5f138a
Fixed sanity checks in several performance tests
2012-11-01 16:29:30 +04:00
Andrey Kamaev
b5ecb1d32d
Merge pull request #111 from taka-no-me/algorithm/addParam-short
2012-10-31 16:57:06 +04:00
Andrey Kamaev
84934f7bfc
Fix SHORT data type support in Algorithm
...
* typo in Algorithm::addParam for 'short' data type which results in segmentation fault on ARM
on attempt to set type property for FAST using setter inherited from Algorithm
* added short type support to read/write methods
* improved some error messages
2012-10-26 17:00:13 +04:00
Andrey Kamaev
2b0072d823
Suppress more warnings in gtest on OS X
2012-10-24 20:36:30 +04:00
Andrey Kamaev
6211f156e6
Merge 2.4.3-rc
2012-10-24 19:56:27 +04:00
Andrey Kamaev
afc79e2a02
Fix warnings from MSVC 9 64-bit
2012-10-23 18:20:07 +04:00
Andrey Kamaev
0e7ca71dcc
Normalize whitespace in documentation and text files
2012-10-17 21:42:09 +04:00
Andrey Kamaev
461b69f6ee
Eliminate discrepancies between signatures in documentation and OpenCV headers
...
All errors were found by doc/check_docs2.py
2012-10-17 21:24:55 +04:00
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Andrey Kamaev
5a730d09cd
Fix binary compatibility of opencv_features2d
2012-10-17 02:09:14 +04:00
Andrey Kamaev
18ab16dbd3
Revert "some more fixes towards binary compatibility"
...
This reverts commit a8c5e35619
.
Conflicts:
modules/imgproc/src/imgwarp.cpp
2012-10-16 19:35:28 +04:00
Andrey Kamaev
821de96346
Adjust thresholds in sanity checks for batchDistance
2012-10-11 20:35:28 +04:00
Andrey Kamaev
97640847c5
Add methods to sort keypoints and corresponding descriptors
2012-10-11 18:25:45 +04:00
Andrey Kamaev
006a4ba529
Fix gcc build error introduced in a9f36df
2012-10-10 13:24:49 +04:00
Andrey Kamaev
a9f36dfcfe
Fix read after the end of local buffer in SSE-optimized TYPE_5_8 and TYPE_7_12 FAST cornerScore
2012-10-10 02:32:47 +04:00
Andrey Kamaev
5047f2d64d
Fix perf tests in features2d module
2012-10-09 18:41:27 +04:00
Andrey Kamaev
d4cf9e22cc
Fix terrible perf test for FAST detector
2012-10-09 18:41:26 +04:00
Vadim Pisarevsky
b0ad424087
fixed several warnings from VS2010
2012-10-09 17:24:37 +04:00
Vadim Pisarevsky
a8c5e35619
some more fixes towards binary compatibility
2012-10-09 15:56:16 +04:00
Andrey Kamaev
b486a59221
Quiet MSVC warning
2012-10-08 10:36:48 +04:00
Andrey Kamaev
9218bdcbb4
TBB version of GridAdaptedFeatureDetector
2012-10-04 16:58:34 +04:00
Vadim Pisarevsky
06a13d9ba0
replaced jpegs with png's. Accuracy tests pass; performance tests were not tried yet
2012-10-02 23:07:46 +04:00
Anatoly Baksheev
46874d40df
warnings under windows
2012-10-01 23:57:37 +04:00
Vadim Pisarevsky
420dd22258
fixed a few warnings reported by Oleg; restored SSE2 optimization in FAST
2012-10-01 14:12:19 +04:00
Vadim Pisarevsky
60769f544f
possibly repaired FAST test (however, FAST<7/12> and <5/8> could still do something different than described in the paper)
2012-09-25 15:50:03 +04:00
Vadim Pisarevsky
854902b077
lowered tolerance thresholds in BRISK tests
2012-09-24 16:31:07 +04:00
Vadim Pisarevsky
2d334401b1
improved the condition in the FAST test
2012-09-18 14:34:50 +04:00
Vadim Pisarevsky
84087a8566
fixed crash in Python's SURF wrapper (bug #2325 )
2012-09-11 16:47:25 +04:00
Andrey Kamaev
b8adc04545
Fix Android build warnings
2012-09-06 18:54:38 +04:00
Vadim Pisarevsky
014106783d
fixed building BRISK on Windows
2012-08-30 17:32:47 +04:00
Vincent Rabaud
3ca0cc2253
add a scale invariance test for the detector
2012-08-30 16:28:39 +04:00
Vincent Rabaud
84c4797030
revert orientation computation in jeypoint detection for efficiency (like done originally)
2012-08-30 16:28:39 +04:00
Vincent Rabaud
da1921b2fc
add const correctness, replace __inline__ and remote a useless release()
2012-08-30 16:28:39 +04:00
Vincent Rabaud
92da6d381b
add rotation tests for the descriptors
2012-08-30 16:28:39 +04:00
Vincent Rabaud
b325b2f9a4
add more test to BRISK
2012-08-30 16:28:39 +04:00
Vincent Rabaud
13ded36ecb
initial addition of BRISK with some tests
2012-08-30 16:28:39 +04:00
Vincent Rabaud
228070a74c
split FAST in order to reuse it in BRISK
2012-08-30 16:28:38 +04:00
Vadim Pisarevsky
633a8bfacc
fixed many warnings (modified pull request 13)
2012-08-28 18:15:14 +04:00
Corentin Wallez
18fc11bc04
Fix fixed-point arithmetics in FREAK::meanIntensity
2012-08-28 16:57:20 +04:00
Vsevolod Glumov
5648e49d59
Merge remote-tracking branch 'origin/master'
2012-08-23 14:58:41 +04:00
Vsevolod Glumov
fc307c87dc
Improved the public 'non-optimized' duplicates of 'Tegra-optimized' functions.
2012-08-23 14:56:02 +04:00
Andrey Kamaev
f2a02feffa
Fix Windows build issues
...
* No /arch:SSE3 in MSVC
* Warnings fixed or suppressed
2012-08-22 11:21:09 +04:00
Andrey Kamaev
94f7c3c592
Fixed FAST algorithm initializer
2012-08-21 01:03:52 +04:00
Andrey Kamaev
65f8585630
#2229 Fix FREAK build on CentOS
2012-08-15 17:23:07 +04:00
Andrey Kamaev
859ee6087c
#2216 Forbid incorrect patchSize values in ORB
2012-08-15 16:54:40 +04:00
Andrey Kamaev
36fe62d7a5
#2245 Fix BFMatcher::radiusMatchImpl witch Hamming distance (thanks to Jukka Holappa)
2012-08-15 15:02:20 +04:00
Daniil Osokin
45c49a9088
Added perf test
2012-08-10 17:37:48 +04:00
Andrey Kamaev
017abbd963
Lowered acceptance threshold in Features2d_RotationInvariance_Detector_ORB.regression test
2012-08-08 17:15:46 +04:00
Vadim Pisarevsky
36d3bbff8b
added description of FAST 5/8 and FAST 7/12 (by Vincent)
2012-08-07 18:17:30 +04:00
Andrey Kamaev
9981b283a6
Fixed build warnings (including error in FAST)
2012-08-06 19:10:55 +04:00
Vadim Pisarevsky
640408ebe7
added FAST<5/8> & FAST<7/12> (by Vincent Rabaud)
2012-07-31 17:17:58 +04:00
Maria Dimashova
cfeb28f2ba
fixed tests for scale invariance (uncommented sift test, it's ok now)
2012-07-16 16:21:40 +00:00
Maria Dimashova
2556bb04f0
changed tests for rotation/scale invariance of descriptors
2012-07-16 13:01:55 +00:00
Maria Dimashova
63d8eedc51
changed the way of HARRIS creation
2012-07-16 09:26:02 +00:00
Maria Dimashova
ec23d9bb5e
added tests on scale invariance of detectors and descriptors
2012-07-15 17:42:41 +00:00
Maria Dimashova
e4e00498a8
fixed typo in test class names
2012-07-14 20:32:31 +00:00
Maria Dimashova
0c6480d89b
added tests to check rotation invariance of descriptors (features2d and nonfree)
2012-07-14 20:03:07 +00:00
Maria Dimashova
6dc5cd15ed
specified KeyPoint::angle in rst doc and code comment
2012-07-14 15:36:35 +00:00
Maria Dimashova
eb119959e8
fixed features2d rotation invariance tests
2012-07-14 15:05:41 +00:00
Maria Dimashova
c94974ccb3
fixed mser (angle is -1 now)
2012-07-14 15:03:39 +00:00
Maria Dimashova
2bd86e2541
fixed compile errors under win
2012-07-14 13:25:41 +00:00
Maria Dimashova
30c611f1d5
added tests to check rotation invariance of detectors
2012-07-13 18:03:20 +00:00
Maria Dimashova
438c1444eb
added test to check keypoints returned by FeatureDetector (center, size, angle)
2012-07-12 17:52:49 +00:00
Maria Dimashova
017895dd93
filtered MSER keypoints that have centers out of image
2012-07-12 17:51:12 +00:00
Maria Dimashova
507f546158
split file of features2d tests
2012-07-12 13:57:17 +00:00
Alexander Mordvintsev
c5669448a3
work on features2d python interface
2012-07-11 17:13:43 +00:00
Marina Kolpakova
8c9a9f1c94
fixed documentation missmatch for ORB
2012-07-08 18:26:23 +00:00
Alexander Mordvintsev
c6705fbe20
exposed ORB features to python
2012-07-06 15:41:57 +00:00
Andrey Kamaev
e900952b87
quiet most of the OSX build warnings
2012-07-05 12:56:31 +00:00
Andrey Kamaev
aa4cad80a0
Fixed opponent space color conversion
2012-07-03 11:01:56 +00:00
Maria Dimashova
ad6929b6a4
removed y-axis inversion in drawKeypoints (FeatureDetector has to do this)
2012-07-02 12:04:00 +00:00
Maria Dimashova
0f21890d7d
added test for opponent descriptor extractor
2012-07-02 11:58:17 +00:00
Maria Dimashova
6042c59495
fixed #1764
2012-07-01 22:40:25 +00:00
Andrey Kamaev
afe11f69fb
Fixed Windows build warnings and configuration problem.
2012-06-30 20:45:01 +00:00
Andrey Kamaev
0584ac525b
Quiet MSER tests
2012-06-29 08:34:07 +00:00
Andrey Kamaev
4d09d62f85
Added Ptr<T> support to AlgorithmInfo; fixed some warnings
2012-06-29 07:46:53 +00:00
Andrey Kamaev
e4965b143f
Fixed discrepancy between SSE and regular baranches in FREAK
2012-06-28 11:08:11 +00:00
Andrey Kamaev
7b806f6008
fixed several documentation errors
2012-06-25 12:56:46 +00:00
Andrey Kamaev
d9c74f63e1
All tests writing temporary files are updated to use cv::tempfile() function
2012-06-25 11:24:06 +00:00
Andrey Kamaev
ec3a7665b0
Fixed FREAK on Android
2012-06-25 11:19:11 +00:00
Andrey Kamaev
84d62b69dc
Fixed windows build of FREAK
2012-06-24 14:33:30 +00:00
Vadim Pisarevsky
74707ec7ae
added FREAK (by Kirell Benzi, Raphael Ortiz, Alexandre Alahi and Pierre Vandergheynst)
2012-06-24 01:37:55 +00:00
Andrey Kamaev
c5aba337e9
Fixed number of warnings. Fixed mingw64 build.
2012-06-12 14:46:12 +00:00
Andrey Kamaev
f2d3b9b4a1
Warning fixes continued
2012-06-09 15:00:04 +00:00
Andrey Kamaev
47a4e87784
Ignored warnings from gtest with precompiled headers enabled
2012-06-08 14:54:17 +00:00
Andrey Kamaev
f62028dc16
Fixed mingw build.
2012-06-08 03:15:08 +00:00
Andrey Kamaev
49a1ba6038
Set stricter warning rules for gcc
2012-06-07 17:21:29 +00:00
Vadim Pisarevsky
2990f23e0c
grid-adapted feature detector made a proper Algorithm (ticket #1874 )
2012-06-01 09:10:53 +00:00
Andrey Kamaev
9399394e6c
Fixed #1996
2012-05-31 08:02:52 +00:00
Andrey Kamaev
a20248977c
Documentation: fixed class/struc members documentation; added warning on incorrectly documented member
2012-05-29 16:55:46 +00:00
Andrey Kamaev
40e8d08e8d
Added check for trailing semicolon to rst parser; fixed few documentation build warnings
2012-05-29 10:57:25 +00:00
Andrey Kamaev
05de6302fd
Fixed documentation: corrected parameter names
2012-05-29 10:36:19 +00:00
Andrey Kamaev
6ca618277c
More fixes for documentation.
2012-05-28 20:11:38 +00:00
Andrey Kamaev
78329b0dfe
New bunch of documentation fixes
2012-05-28 14:36:15 +00:00
Andrey Kamaev
eb2f1f81ed
Fixed hundreds of documentation problems
2012-05-28 07:36:14 +00:00
Alexander Mordvintsev
e703e8f5a6
exposed MSER to python again
2012-05-22 15:53:39 +00:00
Vadim Pisarevsky
fd68cc768a
fixed 2 build problems on MacOSX (highgui with ffmpeg, opencv_world); added macro CV_INIT_ALGORITHM for simpler algorithm registration (ticket #1876 )
2012-05-21 14:56:07 +00:00
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
2012-04-30 14:33:52 +00:00
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
Vadim Pisarevsky
beb7fc3c92
a LOT of obsolete stuff has been moved to the legacy module.
2012-03-30 12:19:25 +00:00
Andrey Kamaev
ec793df30f
#1205 fixed more bugs/typos in parameters
2012-03-29 08:07:57 +00:00
Andrey Kamaev
94c258cf15
#1205 fixed ~100 of ~700 parameters
2012-03-29 06:50:05 +00:00
Andrey Kamaev
ce89d00fcf
Implemented missed AlgorithmInfo for BRIEF
2012-03-29 03:06:59 +00:00
Maria Dimashova
9c12cc6b03
added doc on DenseFeatureDetector ( #1311 )
2012-03-28 09:39:40 +00:00
Maria Dimashova
f262651465
added test case of matching the same descriptors
2012-03-27 13:20:54 +00:00
Leonid Beynenson
a97c2c838c
Made small change which fixes the situation, when ORB does not find any descriptors on an image. Earlier ORB::operator() crashed in this case, since rowRange method was called for an empty matrix.
2012-03-23 12:06:49 +00:00
Vadim Pisarevsky
0c381e2a9f
increased the default number of pyramid layers in ORB; updated test data
2012-03-20 14:20:06 +00:00
Vadim Pisarevsky
d60623279c
switched to non-constant references in Algorithm::addParam, which is more safe.
2012-03-17 09:50:47 +00:00
Vadim Pisarevsky
4985c1b632
fixed hundreds of warnings from MSVC 2010.
2012-03-16 21:21:04 +00:00
Vadim Pisarevsky
2d1ef5eea8
fixed build on VS2010
2012-03-15 15:38:54 +00:00
Vadim Pisarevsky
957e80abbd
lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template.
2012-03-15 14:36:01 +00:00
Andrey Kamaev
e4307d05f3
Made dependency of features2d and calib3d from highgui optional
2012-03-13 12:33:16 +00:00
Ilya Lysenkov
df6a95ed87
Wraped SimpleBlobDetector for Python
2012-03-12 11:39:48 +00:00
Alexander Shishkov
f67a0902aa
fixed #1618
2012-03-02 18:36:34 +00:00
Andrey Kamaev
691d392312
Fixes: Android NDK r7b, android build warnings, build with Visual Studio 2005.
2012-02-16 20:29:35 +00:00
Vincent Rabaud
2219e38192
fix a potential crash when there are no keypoints
2012-02-16 19:21:48 +00:00
Anatoly Baksheev
84db4eb6fa
fixed ~200 warnings for windows
...
minor build system changes (now cuda code in opencv_core is compiled using CUDA_ARCH* cmake variables)
2012-02-14 10:22:34 +00:00
Andrey Kamaev
984eb99428
Global CMake reorganization:
...
[~] Automatically tracked dependencies between modules
[+] Support for optional module dependencies
[+] Options to choose modules to build
[~] Removed hardcoded modules lists from OpenCVConfig.cmake, opencv.pc and OpenCV.mk
[+] Added COMPONENTS support for FIND_PACKAGE(OpenCV)
[~] haartraining and traincascade are moved outside of modules folder since they aren't the modules
2012-02-03 11:26:49 +00:00
Andrey Kamaev
65f5343ed5
Refactored performance tests. TEST_CYCLE macro is renamed to TEST_CYCLE_N; SIMPLE_TEST_CYCLE is renamed to TEST_CYCLE; from now 100 iterations are default for performance tests
2011-12-29 16:46:16 +00:00
Andrey Kamaev
ec7bc9e497
Fixed ORB and SURF regression tests
2011-12-21 15:22:22 +00:00
Alexander Mordvintsev
f2d2c8db77
exposed SurfFeatureDetector and SurfDescriptorExtractor to python
2011-11-29 12:24:38 +00:00
Vadim Pisarevsky
0c773ca931
updated ORB: limit the number of output keypoints, use bi-linear interpolation between subsequent layers instead of much slower area-based interpolation between 0-th and i-th layers.
2011-11-22 09:44:37 +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
Andrey Kamaev
3970664e24
Performance test for FAST features detector
2011-10-28 12:52:20 +00:00
Andrey Kamaev
3f22a1c40f
Performace tests for ORB
2011-10-27 14:46:12 +00:00
Andrey Kamaev
21a4a06d8a
Fixed bug in KeyPointsFilter::runByImageBorder; added ROI adjustment to ORB
2011-10-21 08:38:47 +00:00
Vadim Pisarevsky
b74116e694
unified norm computing; added generalized Hamming distance
2011-10-11 15:13:53 +00:00
Vadim Pisarevsky
f947c2eb96
new, much simpler and SSE2-optimized implementation of FAST
2011-10-09 18:15:13 +00:00
Andrey Kamaev
22bd127365
Added performance tests for cv:phase and cv::SURF
2011-10-07 13:55:26 +00:00
Alexander Mordvintsev
0ad1d0afac
fixed problem with incorrect distance values returned by FlannBasedMatcher for hamming metric (int's were interpreted as floats)
2011-09-22 08:52:40 +00:00
Alexander Mordvintsev
028c44531f
wrapped FlannBasedMatcher (and extended DescriptorMatcher wrapper)
...
updated feature_homography.py sample to use new features
2011-09-15 11:10:06 +00:00