Commit Graph

705 Commits

Author SHA1 Message Date
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
Roman Donchenko
13cd0a0502 Merge remote-tracking branch 'origin/2.4'
Original pull requests:
	#996 from jet47:gpu-nvcuvid-libraries
	#995 from jet47:fix-bug-2985
	#999 from snosov1:unreliable-results-fix
	#1005 from alekcac:doc_fix
	#1004 from jet47:fix-bug-3068
	#987 from jet47:bug-3085-fix
	#969 from pengx17:2.4_binary_cache
	#929 from dominikrose:mingw-libdc1394-2-windows
	#1000 from ivan-korolev:fix_sift_bug_2892
	#1001 from ivan-korolev:fix_stitching_bug_2405
	#998 from asmorkalov:android_cmake_mips_fix
	#993 from ivan-korolev:fix_videostab_bug_3023
	#988 from snosov1:3071-fix
	#986 from pengx17:2.4_initiated_context
	#982 from pengx17:2.4_fix_two_bugs
	#981 from SeninAndrew:ximea_camera_support_fix
	#991 from asmorkalov:android_javadoc_fix
	#972 from jet47:mog2-params-bug-2168
	#980 from SpecLad:include-config
	#973 from pengx17:2.4_oclclahe
	#903 from aks2:2.4
	#968 from asmorkalov:android_na_cproj_fix
	#971 from SpecLad:matchers-ctor
	#970 from asmorkalov:dshow_valid_check_fix
	#965 from apavlenko:fix_java_empty_mats

Conflicts:
	cmake/OpenCVModule.cmake
	modules/core/src/matmul.cpp
	modules/gpu/CMakeLists.txt
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/stitching/src/matchers.cpp
	modules/video/src/video_init.cpp
	modules/videostab/src/global_motion.cpp
2013-06-19 15:25:37 +04:00
Roman Donchenko
6faf00b8e5 Merge pull request #696 from znah:detect_method 2013-06-13 12:01:59 +04:00
Roman Donchenko
3af21cad4c Merge pull request #903 from aks2:2.4 2013-06-11 17:35:39 +04:00
Roman Donchenko
bae85660da Merge remote-tracking branch 'origin/2.4'
Pull requests:
	#943 from jet47:cuda-5.5-support
	#944 from jet47:cmake-2.8.11-cuda-fix
	#912 from SpecLad:contributing
	#934 from SpecLad:parallel-for
	#931 from jet47:gpu-test-fixes
	#932 from bitwangyaoyao:2.4_fixBFM
	#918 from bitwangyaoyao:2.4_samples
	#924 from pengx17:2.4_arithm_fix
	#925 from pengx17:2.4_canny_tmp_fix
	#927 from bitwangyaoyao:2.4_perf
	#930 from pengx17:2.4_haar_ext
	#928 from apavlenko:bugfix_3027
	#920 from asmorkalov:android_move
	#910 from pengx17:2.4_oclgfft
	#913 from janm399:2.4
	#916 from bitwangyaoyao:2.4_fixPyrLK
	#919 from abidrahmank:2.4
	#923 from pengx17:2.4_macfix

Conflicts:
	modules/calib3d/src/stereobm.cpp
	modules/features2d/src/detectors.cpp
	modules/gpu/src/error.cpp
	modules/gpu/src/precomp.hpp
	modules/imgproc/src/distransform.cpp
	modules/imgproc/src/morph.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/precomp.cpp
	modules/ocl/perf/precomp.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/src/pyrlk.cpp
	modules/video/src/bgfg_gaussmix2.cpp
	modules/video/src/lkpyramid.cpp
	platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh
	platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh
	platforms/scripts/ABI_compat_generator.py
	samples/ocl/facedetect.cpp
2013-06-05 15:42:07 +04:00
Roman Donchenko
29b13ec1de Replaced most of the usages of parallel_for with that of parallel_for_.
This should allow many algorithms to take advantage of more parallelization
technologies.
2013-05-31 12:22:04 +04:00
alex77git
6e7b1ef252 Bug #2967, void DescriptorMatcher::radiusMatch() // description unclear,
only file:  common_interfaces_of_descriptor_matchers.rst
2013-05-20 02:26:58 +02:00
Brian McKinnon
36745a80c3 Added #include <limits> to files that were missing it. 2013-05-06 22:45:11 -04:00
Andrey Kamaev
8fdab9f631 Merge branch '2.4' 2013-04-17 12:07:17 +04:00
Andrey Kamaev
96b008cd29 Eliminate the need of ::testsing::ValuesIn() for CV_ENUM
Also cv::, cv::gpu:: and cv::ocl:: namespace prefixes can be safely omitted
inside CV_ENUM and CV_FLAGS
2013-04-15 19:39:49 +04:00
Andrey Kamaev
e5a33723fc Move C API of opencv_calib3d to separate file 2013-04-11 21:00:17 +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
ae4e76395f Make flann headers independent from OpenCV C API 2013-04-08 15:47:29 +04:00
Andrey Kamaev
67073daf19 Merge branch '2.4' 2013-04-05 21:11:59 +04:00
Alexander Shishkov
382695ba5a removed links to the http://opencv.willowgarage.com/ 2013-04-04 13:44:28 +04:00
Andrey Kamaev
78c70ab948 Merge pull request #747 from taka-no-me:split_c_cpp 2013-04-04 00:55:22 +04:00
Andrey Kamaev
de848a08d3 Merge pull request #722 from gpsinghsandhu:blob-detector-cpp 2013-04-03 15:58:17 +04:00
Andrey Kamaev
517062039e Make core/internal.hpp a private header 2013-04-01 17:29:10 +04:00
Andrey Kamaev
2b1ef95415 Completely separate C and C++ API of OpenCV core 2013-04-01 15:24:34 +04:00
Andrey Kamaev
db45e04d58 Merge pull request #720 from taka-no-me:drop_sort 2013-04-01 15:14:45 +04:00
Vladislav Vinogradov
3d095ccc82 fixed condition in KeyPointsFilter::retainBest 2013-04-01 11:53:43 +04:00
gpsinghsandhu
77e51ff9c4 contours with zero area rejected
reject contours with zero area by using the "continue" statement to be in sync with the condition checking style used in the whole file
2013-03-31 16:13:40 +05:30
gpsinghsandhu
0d16a9befb In response to Bug #2927
change to reject contours with moms.m00 = 0.0
2013-03-30 00:33:22 +05:30
Andrey Kamaev
cc6bdfb045 Remove inline sorting algorithms from core headers 2013-03-28 17:22:50 +04:00
Andrey Kamaev
2edfae5070 Move documentation for cv::KeyPoint and cv::DMatch to core 2013-03-26 17:20:51 +04:00
Andrey Kamaev
49f6dad13f Move cv::KeyPoint and cv::DMatch to core 2013-03-26 16:08:43 +04:00
Andrey Kamaev
bafd359083 Merge pull request #695 from taka-no-me/cv_str
cv::String to replace the std::string
2013-03-25 03:24:42 -07:00
marina.kolpakova
4096b54560 use static assertation where suitable 2013-03-25 00:29:12 +04:00
Alexander Mordvintsev
4d510be2c9 added compute function to Feature2D (dirty workaround for #2699) 2013-03-23 14:06:33 +04:00
Andrey Kamaev
33ef7990b0 Update documentation 2013-03-22 22:14:54 +04:00
Andrey Kamaev
be7bbe3aa9 Drop cv:: prefix from cv::String used inside the cv namespace 2013-03-22 22:14:50 +04:00
Andrey Kamaev
762aefd71b Compile opencv_test_core with cv::String instead of std::string
All tests passed!
2013-03-22 22:14:22 +04:00
Andrey Kamaev
89356ff16d Move non-CV functionality from core.hpp to separate utility.hpp header 2013-03-20 17:56:06 +04:00
Andrey Kamaev
a42a0f5fca Added compatibility headers 2013-03-13 17:26:56 +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
891d7da6ee Merge branch '2.4' 2013-02-28 11:17:06 +04:00
Andrey Kamaev
0d12f451be Merge pull request #524 from LeonidBeynenson:add_float_and_unsigned_parameters_to_cv_algorithm 2013-02-26 01:00:55 +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
9498856b22 Fix documentation problems found by check_docs2 script 2013-02-20 15:07:13 +04:00
Andrey Kamaev
637397f621 Merge branch '2.4' 2013-02-20 12:31:16 +04:00
Andrey Kamaev
ff7b604a25 Fix several inconsistent declarations identified by check_doc2 script 2013-02-19 16:22:20 +04:00
LeonidBeynenson
203849d5e4 The next attempt to fix a build error on Mac. 2013-02-06 18:07:02 +04:00
LeonidBeynenson
50cd5d9ce7 Try to fix Mac compilation issue. 2013-02-06 15:31:51 +04:00
LeonidBeynenson
b85a098d9c Added float, uint64, and uchar params to Algorithm
Made changes to work in cv::Algorithm with parameters of these types.
Also fixed SimpleBlobDetector -- now it can be created by
cv::Algorithm::create and it can work with cv::Algorithm::set/get.
2013-02-04 20:25:18 +04:00
Andrey Kamaev
c527340cb6 Merge branch 2.4 2013-02-04 17:15:55 +04:00
Andrey Kamaev
f608df9640 Merge pull request #427 from vrabaud:brisk_fixes_2.4 2013-02-04 17:10:02 +04:00
Vincent Rabaud
d235c3a678 define the default remapping in the right scope 2013-02-04 11:08:00 +01:00
Vincent Rabaud
0b1599d88a write documentation for BRISK 2013-02-04 11:07:53 +01:00
Andy Maloney
c8cad0857e Remove unused constructor
Add checks for valid values
Fix wording on some errors
2013-02-02 16:09:10 -05: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
f4e27bcbbc Merge branch '2.4' 2013-01-25 16:30:36 +04:00
mdim
93f8e7ba74 check of keypoint index range in drawMatches 2013-01-22 00:37:27 +04:00
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
Alexander Mordvintsev
b679ebc1b4 python DescriptorExtractor.compute now returns filtered keypoints
wrapped StarFeatureDetector and GridAdaptedFeatureDetector
2011-09-15 08:07:37 +00:00
Vadim Pisarevsky
82da7f18d8 replaced "unsigned int" -> "unsigned" to make Python/Java wrapper generator work correctly 2011-09-14 14:29:30 +00:00
Alexander Mordvintsev
d50cc51070 handling Ptr<> arguments and return values in Python wrappers
partially wrapped features2d framework
added feature_homography.py sample
2011-09-07 09:38:22 +00:00
Vadim Pisarevsky
d3d55f3234 fixed crashes in parallel HOG detector; avoid use of new POPCNT instruction in ORB (to make it compatible with older CPUs). 2011-08-16 13:52:02 +00:00
Andrey Kamaev
7820c343eb Documentation: fixed CvSlice and FeatureDetector descriptions. 2011-08-15 07:05:04 +00:00
Vadim Pisarevsky
a51a8ad577 fixed tickets #1301, #1303, #1305 2011-08-14 19:46:39 +00:00
Andrey Kamaev
d6e3ccc1b2 Documentation: fixed about 100 cross-referencing errors. 2011-08-13 16:49:40 +00:00
Vadim Pisarevsky
411f51367e raised threshold in ORB test; temporarily disabled always failing Opponent SIFT test 2011-08-11 21:35:04 +00:00
Maria Dimashova
81cb7b2c5e added read/write methods for SimpleBlobDetector and DenseFeatureDetector; added their creation to FeatureDetector::create method (#1290) 2011-08-10 09:17:37 +00:00
Maria Dimashova
999481273e fixed memory leak in SIFT wrapper (#1288) 2011-08-10 07:02:50 +00:00
Maria Dimashova
4839bfb1a5 fixed grammar of the comment 2011-08-08 14:03:37 +00:00
Maria Dimashova
fcd999ae6e added SL2 (squared L2 distance) and implemented the descriptors matching in L2 using SL2 2011-08-08 13:18:12 +00:00
Maria Dimashova
dc14b45617 minor changes 2011-08-08 12:47:04 +00:00
Vadim Pisarevsky
3f40a1d8c3 fixed KeyPoint::convert(keypoints,point2f) (ticket #1282; thanks to cooperz for the patch) 2011-08-06 19:42:29 +00:00
Maria Dimashova
7db3dd4f0a fixed comment and doc on L2 2011-08-05 14:05:41 +00:00
Maria Dimashova
0d55ccac74 added check of output image in drawKeypoints() 2011-08-05 14:04:38 +00:00
Andrey Kamaev
874196e384 Implemented read/write methods for FlannBasedMatcher; fixed features2d wrappers for java 2011-08-04 14:13:07 +00:00
Andrey Kamaev
13185ad8f7 Implemented read/write methods for BriefDescriptorExtractor class 2011-08-04 09:56:10 +00:00
Andrey Kamaev
1523cb04d1 Added CV_EXPORTS to OrbDescriptorExtractor (ticket #1276) 2011-08-04 06:19:52 +00:00
Andrey Kamaev
be5328178f Fixed reading/writing parameters for OrbDescriptorExtractor 2011-08-04 06:18:24 +00:00
Andrey Kamaev
6935e95c2a Fixed crash in BruteForceMatcher::clone 2011-08-03 11:30:09 +00:00
Vadim Pisarevsky
41df54e75f fixed several typoes and errors in the refman (ticket #1203) 2011-07-22 12:50:49 +00:00
Vadim Pisarevsky
ff5e97c8e4 added COVAR_ and SORT_ enums to core.hpp; fixed many, many VS2005, VS2010 and MinGW (GCC 4.5.2) warnings 2011-07-19 12:27:07 +00:00
Vadim Pisarevsky
562914e33b upgraded to FLANN 1.6. Added miniflann interface, which is now used in the rest of OpenCV. Added Python bindings for FLANN. 2011-07-13 23:04:39 +00:00
Maria Dimashova
0b1575c485 fixed SIFT when keypoints vector is empty (#1162) 2011-07-08 15:54:57 +00:00
Maria Dimashova
370130e464 fixed PyramidAdaptedFeatureDetector (when mask is not empty) (#1206) 2011-07-08 14:41:43 +00:00
Andrey Kamaev
3fc879075b Fixed typo in features2d doc 2011-07-05 13:02:29 +00:00
Vadim Pisarevsky
6c8a2b8888 propagated fixes in docs and cap_dshow to trunk 2011-07-01 09:39:22 +00:00
Vincent Rabaud
3e1b0186fe - make sure we don't crash for an empty image 2011-07-01 01:28:14 +00:00
Bernat Gabor
762bc0f8af Some reST syntax correction. Now the PDF documentation builds correctly under Windows using MIKTEX. Some update on the tutorial structure. Some CSS syntax correction. Windows Install Tutorial v0.4. 2011-06-30 00:41:41 +00:00
Vadim Pisarevsky
b204e73d9a propagated some more fixes from 2.3 branch to the trunk 2011-06-29 22:06:42 +00:00
Vincent Rabaud
b5754550ab fix #1169 2011-06-29 17:01:23 +00:00
Vincent Rabaud
7c2e74b649 - fix a bug if the descriptor is used for images of different size 2011-06-24 23:21:39 +00:00
Vadim Pisarevsky
49467947ac propagated some fixes from 2.3 to trunk 2011-06-23 12:00:09 +00:00
Maria Dimashova
4f86b30abc fixed #1140 and made some other updates of features2d docs 2011-06-17 13:23:28 +00:00
Maria Dimashova
e95f8194e2 uncommented Opponent descriptors test, fixed descriptors mat size 2011-06-17 10:47:35 +00:00
Vladimir Dudnik
6e38b6aaed removed trailing backspaces, reduced number of warnings (under MSVC2010 x64) for size_t to int conversion, added handling of samples launch without parameters (should not have abnormal termination if there was no paramaters supplied) 2011-06-17 06:31:54 +00:00
Vadim Pisarevsky
8d8ef596c8 introduced new RST/Sphinx domain ocv. 2011-06-16 12:48:23 +00:00
Maria Dimashova
35aa133d9a minor formating 2011-06-15 13:30:26 +00:00
Alexander Shishkov
db85928e7f fixed compilation error on MCVS in descriptors.cpp 2011-06-15 13:26:46 +00:00