Commit Graph

63 Commits

Author SHA1 Message Date
Pavel Vlasov
30a6cee2fe Instrumentation for OpenCV API regions and IPP functions; 2016-08-19 18:10:03 +03:00
Vadim Pisarevsky
3942b1f362 Merge pull request #5340 from alalek:ocl_off 2015-11-10 16:53:36 +00:00
Maksim Shabunin
6e9d0d9a0c Visual Studio 2015 warning and test fixes 2015-10-20 12:48:37 +03:00
Alexander Alekhin
7213e5f68a ocl: correct disabling of OpenCL code 2015-09-13 20:28:23 +03: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
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
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
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
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
PhilLab
92826a0436 ORB crashed with no keypoints present 2014-08-23 14:02:15 +02:00
Alexander Alekhin
55188fe991 world fix 2014-08-05 20:12:35 +04:00
Vadim Pisarevsky
3e854fa6e5 finished OpenCL port of ORB 2014-03-13 22:56:53 +04:00
Konstantin Matskevich
f44334285b features2d 2014-02-04 16:55:07 +04:00
Ilya Lavrenov
e559256719 added cv::GFTTDetector 2014-01-25 00:23:59 +04:00
Roman Donchenko
e49b8dee40 Merge pull request #1881 from pentschev:defaultNorm_master 2013-12-17 13:53:59 +04: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
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
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
Andrey Kamaev
c98c246fc2 Move border type constants and Moments class to core module 2013-04-10 19:14:24 +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
859ee6087c #2216 Forbid incorrect patchSize values in ORB 2012-08-15 16:54:40 +04:00
Andrey Kamaev
f2d3b9b4a1 Warning fixes continued 2012-06-09 15:00:04 +00:00
Andrey Kamaev
9399394e6c Fixed #1996 2012-05-31 08:02:52 +00:00
Vadim Pisarevsky
2fd1e2ea57 merged all the latest changes from 2.4 to trunk 2012-04-13 21:50:59 +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
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
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
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
21a4a06d8a Fixed bug in KeyPointsFilter::runByImageBorder; added ROI adjustment to ORB 2011-10-21 08:38:47 +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
Vincent Rabaud
3e1b0186fe - make sure we don't crash for an empty image 2011-07-01 01:28:14 +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
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
fcd2a0c3d3 fixed VS2010 compile warnings and errors 2011-06-06 15:15:30 +00:00
Vincent Rabaud
aa6c2bfbbb - fixed the grayscale case 2011-06-02 23:12:52 +00:00
Vincent Rabaud
3ed829af71 - make sure we deal with a grayscale image 2011-06-02 22:58:52 +00:00
Vincent Rabaud
ff13c9f818 - fix potential crash if the first scale level is not 0 2011-06-02 18:08:30 +00:00