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
Ilya Lavrenov
35d9ce0c0c
fixed warnings
2013-10-08 12:46:43 +04:00
Roman Donchenko
1eacb485c5
Boring changes - features2d.
2013-09-05 18:26:44 +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
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
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
Andrey Kamaev
c98c246fc2
Move border type constants and Moments class to core module
2013-04-10 19:14:24 +04:00
Andrey Kamaev
ad5cddc007
Main module headers are moved 1 level up
...
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +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
Andrey Kamaev
61079547f0
Merge branch '2.4'
2013-02-01 14:59:40 +04:00
Ilya Lysenkov
7745c8806c
Added info() method in descriptor matchers ( #2330 )
2013-02-01 02:23:40 +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
marina.kolpakova
7a5b9a6b7f
replase __APPLE__ marco with __clang__
2012-11-01 19:34:05 +04:00
Andrey Kamaev
2b0072d823
Suppress more warnings in gtest on OS X
2012-10-24 20:36:30 +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
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
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
Vincent Rabaud
3ca0cc2253
add a scale invariance test for the detector
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
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
017abbd963
Lowered acceptance threshold in Features2d_RotationInvariance_Detector_ORB.regression test
2012-08-08 17:15:46 +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
eb119959e8
fixed features2d rotation invariance tests
2012-07-14 15:05:41 +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
507f546158
split file of features2d tests
2012-07-12 13:57:17 +00:00
Andrey Kamaev
e900952b87
quiet most of the OSX build warnings
2012-07-05 12:56:31 +00:00
Maria Dimashova
0f21890d7d
added test for opponent descriptor extractor
2012-07-02 11:58:17 +00:00
Andrey Kamaev
0584ac525b
Quiet MSER tests
2012-06-29 08:34:07 +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
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
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