mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-30 06:10:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
15,758 Commits 6 Branches 126 Tags 3 GiB
f9b2444735
Commit Graph

751 Commits

Author SHA1 Message Date
Ievgen Khvedchenia
5662294319 Rename KAZE to KAZEFeatures to fix MSVS x64 compiler error (Duplicate file name confused it) 2014-04-28 16:34:35 +03:00
Ievgen Khvedchenia
599bcfb591 Fix size_t to int conversion 2014-04-28 16:24:35 +03:00
Ievgen Khvedchenia
cc0a94c536 Fix "conditional expression constant" warning 2014-04-28 16:23:58 +03:00
Ievgen Khvedchenia
2162aab0e9 Remove AKAZEFeatures desctructor 2014-04-28 15:17:09 +03:00
Ievgen Khvedchenia
f9d3c49023 Bugfix: wrong variable name 2014-04-28 15:14:03 +03:00
Ievgen Khvedchenia
f9422f60a6 Fix Fix casting from/to int/float that caused lot of compiler warnings. 2014-04-28 15:13:42 +03:00
Ievgen Khvedchenia
3c596184e4 Added copyright headers for KAZE and AKAZE wrappers 2014-04-28 15:01:42 +03:00
Ievgen Khvedchenia
f97e38d8a6 Fix casting from/to int/float that caused lot of compiler warnings. 2014-04-28 15:00:14 +03:00
Ievgen Khvedchenia
61f79c2632 Fix line ending at EOF 2014-04-28 10:53:09 +03:00
Ievgen Khvedchenia
3cfc22ae4e Fix initialisation order of parallel loop classes for AKAZE descriptor extraction 2014-04-28 10:52:05 +03:00
Ievgen Khvedchenia
f3f0e06c4d Fix parenthesis in assert statements 2014-04-28 10:51:09 +03:00
Ievgen Khvedchenia
0e243541f9 Fix shadowed variable warnings 2014-04-28 10:50:46 +03:00
Ievgen Khvedchenia
ba5bec1de2 Fix mutable compilation error 2014-04-27 23:07:48 +03:00
Ievgen Khvedchenia
eada0f4b48 Fix shadowed i variable warning 2014-04-27 23:04:31 +03:00
Ievgen Khvedchenia
503bd38963 Enable multithreaded extraction of features using cv::parallel_for_ 2014-04-27 22:28:18 +03:00
Ievgen Khvedchenia
d37220e8ff Clean-up of the iostream manipulator in AKAZEConfig. 2014-04-26 23:34:38 +03:00
Ievgen Khvedchenia
d8c9bb777e Fix return value of descriptorType() 2014-04-26 23:34:07 +03:00
Ievgen Khvedchenia
86888bdf77 Replace swap with clear (more efficient) 2014-04-24 22:01:45 +01:00
Ievgen Khvedchenia
3e24822fff Bugfix: clear input vector of key points for detection stage 2014-04-24 22:01:29 +01:00
Ievgen Khvedchenia
33b9e4b4a3 Added missing operator() 2014-04-24 22:00:51 +01:00
Ievgen Khvedchenia
36db97068c Added missing operator() 2014-04-24 22:00:37 +01:00
Ievgen Khvedchenia
6d500cc6f7 Merge KAZE and AKAZE features with most recent version 2014-04-23 23:02:02 +01:00
Ievgen Khvedchenia
d27ed856f2 Replace config with AKAZEConfig.h 2014-04-23 22:44:03 +01:00
Andrey Pavlenko
dab8e920b0 Merge pull request #2565 from apavlenko:tapi_stitching 2014-04-15 19:56:11 +04:00
Roman Donchenko
799d2dabd6 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/test/test_arithm.cpp
	modules/cuda/src/cascadeclassifier.cpp
	modules/imgproc/doc/geometric_transformations.rst
	modules/objdetect/src/hog.cpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/moments.cpp
 2014-04-14 16:08:02 +04:00
Alexander Alekhin
e6cc1be7e8 stitching: allow to use dynamic DescriptorMatcher 2014-04-11 13:01:13 +04:00
Alexander Alekhin
89e3e448f5 features2d: workaround for 'utrainDescCollection' issue (PR #2142) 2014-04-11 13:01:07 +04:00
Vadim Pisarevsky
f417c79d16 Merge pull request #1932 from seth-planet:master 2014-04-10 13:36:14 +04:00
Maks Naumov
eb89f5207c remove unused variables in CV_KDTreeTest_CPP::findNeighbors() 2014-04-09 23:07:48 +03:00
Ilya Lavrenov
aa5326c231 cv::norm -> cvtest::norm in tests 
Conflicts:

	modules/core/src/stat.cpp
 2014-04-08 14:49:20 +04:00
Ievgen Khvedchenia
5848e75168 Clean-up from unused utils.h/utils/cpp 2014-04-05 15:25:59 +03:00
Ievgen Khvedchenia
17f305140b Added unit-tests for KAZE and AKAZE features 2014-04-05 10:25:59 +03:00
Ievgen Khvedchenia
137ff7eccb Added KAZE and AKAZE wrappers 2014-04-05 10:25:46 +03:00
Ievgen Khvedchenia
703e012a5b Prepare KAZE and AKAZE sources for integration 2014-04-05 10:24:27 +03:00
Ievgen Khvedchenia
7a59435490 KAZE and AKAZE integration initial commit 2014-04-04 14:25:38 +03:00
Roman Donchenko
c165f07319 Merge pull request #2550 from SpecLad:merge-2.4 2014-04-02 12:00:01 +04:00
Andrey Pavlenko
6c2d77079f Merge pull request #2487 from ilya-lavrenov:tapi_perf_orb 2014-03-31 18:17:50 +04:00
Ilya Lavrenov
c53398a438 performance tests for FAST 2014-03-31 15:03:00 +04:00
Roman Donchenko
f77c68e0fa Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/imgproc/src/opencl/integral_sqrsum.cl
	modules/nonfree/doc/feature_detection.rst
	modules/nonfree/include/opencv2/nonfree/ocl.hpp
	modules/nonfree/src/surf_ocl.cpp
	modules/nonfree/test/test_features2d.cpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/match_template.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/src/opencl/haarobjectdetect_scaled2.cl
	modules/ocl/test/test_imgproc.cpp
 2014-03-31 14:42:00 +04: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
Roman Donchenko
491b84d463 Merge pull request #2478 from clemenscorny:master 2014-03-26 12:19:54 +04:00
Clemens Korner
f1c8b4b965 FEATURES2D: add DenseFeatureDetector Python wrapper 2014-03-25 12:07:01 +01:00
Andrey Pavlenko
6b434befc9 Merge pull request #2480 from vpisarev:ocl_orb 2014-03-14 19:04:19 +04:00
Ilya Lavrenov
b47bec2ed0 performance tests for ORB 2014-03-13 23:30:02 +04:00
Vadim Pisarevsky
4fafab3786 fixed extra whitespace 2014-03-13 23:18:41 +04:00
Vadim Pisarevsky
42e604abea fixed bug in FAST 2014-03-13 23:17:28 +04:00
Vadim Pisarevsky
3e854fa6e5 finished OpenCL port of ORB 2014-03-13 22:56:53 +04:00
Roman Donchenko
95a55453df Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/calib3d/perf/perf_pnp.cpp
	modules/contrib/src/imagelogpolprojection.cpp
	modules/contrib/src/templatebuffer.hpp
	modules/core/perf/opencl/perf_gemm.cpp
	modules/cudafeatures2d/doc/feature_detection_and_description.rst
	modules/cudafeatures2d/perf/perf_features2d.cpp
	modules/cudafeatures2d/src/fast.cpp
	modules/cudafeatures2d/test/test_features2d.cpp
	modules/features2d/doc/feature_detection_and_description.rst
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/perf4au/main.cpp
	modules/imgproc/perf/opencl/perf_blend.cpp
	modules/imgproc/perf/opencl/perf_color.cpp
	modules/imgproc/perf/opencl/perf_moments.cpp
	modules/imgproc/perf/opencl/perf_pyramid.cpp
	modules/objdetect/perf/opencl/perf_hogdetect.cpp
	modules/ocl/perf/perf_arithm.cpp
	modules/ocl/perf/perf_bgfg.cpp
	modules/ocl/perf/perf_blend.cpp
	modules/ocl/perf/perf_brute_force_matcher.cpp
	modules/ocl/perf/perf_canny.cpp
	modules/ocl/perf/perf_filters.cpp
	modules/ocl/perf/perf_gftt.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_imgwarp.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/perf_matrix_operation.cpp
	modules/ocl/perf/perf_ml.cpp
	modules/ocl/perf/perf_moments.cpp
	modules/ocl/perf/perf_opticalflow.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/cl_context.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/video/src/lkpyramid.cpp
	modules/video/src/precomp.hpp
	samples/gpu/morphology.cpp
 2014-03-11 17:20:01 +04:00
Vadim Pisarevsky
efdfca7a11 do not use the large "score" buffer; now without non-max suppression OpenCL FAST is pretty efficient 2014-03-07 18:55:45 +04:00
Vadim Pisarevsky
06c138bd64 make the correctness test pass 2014-03-07 18:18:10 +04:00
sprice
75ed2f52f1 Merge branch 'master' of https://github.com/Itseez/opencv 
Conflicts:
	modules/features2d/include/opencv2/features2d.hpp
	modules/features2d/src/freak.cpp
	modules/features2d/src/stardetector.cpp
 2014-03-06 15:39:06 -08:00
Vadim Pisarevsky
8e1918e86e added OpenCL-accelerated(?) FAST; for now the tests fail :( 2014-03-06 18:04:04 +04:00
Ilya Lavrenov
099ea91823 typos 2014-03-04 12:47:40 +04:00
Ilya Lavrenov
32eb38ec98 fixed defects from coverity.com 2014-02-23 20:21:08 +04:00
Andrey Pavlenko
ff9a0815b9 Merge pull request #2352 from ilya-lavrenov:flann 2014-02-18 13:24:41 +04:00
Ilya Lavrenov
6ad7b64912 some more changes 2014-02-17 21:57:33 +04:00
Roman Donchenko
a0bb74a086 Merge pull request #2337 from pmoulon:master 2014-02-17 12:24:48 +04:00
Roman Donchenko
cfcf07acfa Merge pull request #2328 from rohitgirdhar:bugfix_blobdetector_kpt_radius 2014-02-17 12:23:59 +04:00
Ilya Lavrenov
f74ef644bc changed the signature of add method according to the base class 2014-02-17 02:39:38 +04:00
yash
1a89a03c7c Fixed CV_ASSERT condition in the code for bag of words 2014-02-16 22:33:30 +05:30
Pierre Moulon
8829e9f6c8 Fix a typo error 2014-02-14 12:22:53 +01:00
Rohit Girdhar
a4b5641836 bugfix: blobdetector was putting incorrect diameter value in keypoints 2014-02-12 22:29:04 +05:30
Andrey Pavlenko
b6675ee2a8 Merge pull request #2278 from KonstantinMatskevich:ocl_toinputarray 2014-02-06 12:55:04 +04:00
Konstantin Matskevich
bdfa9fa14a fixes2 2014-02-05 13:51:14 +04:00
Konstantin Matskevich
1aa83d324b fixed docs2 2014-02-05 11:32:35 +04:00
Konstantin Matskevich
eb4c2cd59f removed CV_IN/OUT 2014-02-05 10:55:26 +04:00
Konstantin Matskevich
a0ccb46a7f fixed docs 2014-02-05 10:49:56 +04:00
Konstantin Matskevich
b0f617bc01 fixes 2014-02-05 09:59:04 +04:00
Konstantin Matskevich
f44334285b features2d 2014-02-04 16:55:07 +04:00
Vadim Pisarevsky
8d5e952263 very preliminary port of SURF to T-API (compiles but certainly does not work) 2014-02-04 03:21:03 +04:00
Andrey Pavlenko
5894f82f14 Merge pull request #2202 from ilya-lavrenov:tapi_GFTTDetector 2014-01-31 19:22:18 +04:00
Andrey Pavlenko
06acf7090c Merge pull request #2027 from AD-530:brief_cl 2014-01-27 09:49:46 +04:00
Ilya Lavrenov
9968197ebf doc fix 2014-01-25 14:44:28 +04:00
Ilya Lavrenov
e559256719 added cv::GFTTDetector 2014-01-25 00:23:59 +04:00
Konstantin Matskevich
133f91f3f2 added perf test 2014-01-23 07:51:19 +04:00
Konstantin Matskevich
2f8c29a1f0 removed unnecessary functions and variables 2014-01-22 15:31:27 +04:00
Konstantin Matskevich
3b7683e72f fixed docs 2014-01-22 15:31:26 +04:00
Konstantin Matskevich
ca5689e0db BFMatcher 
match

radiusMatch
 2014-01-22 15:31:26 +04:00
Andrey Pavlenko
4fbd2ef87a Merge pull request #1290 from mbarnach:bow_desc 2014-01-21 19:22:47 +04:00
Matthias Bady
67e2d7ec43 Merge branch 'master' of https://github.com/Itseez/opencv into brief_cl 2014-01-18 10:38:07 +01:00
Roman Donchenko
fee2ed37fc Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/contrib/src/retina.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/src/algorithm.cpp
	modules/core/src/arithm.cpp
	modules/features2d/src/features2d_init.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/imgproc/src/generalized_hough.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/video/src/tvl1flow.cpp
	modules/video/src/video_init.cpp
 2014-01-14 11:53:59 +04:00
Ilya Lavrenov
6b9ebcbf3d deleted extra semicolons 2014-01-07 02:52:30 +04:00
Matthias Bady
9b0a9f2a24 moved documentation of BriefDescriptorExtractor to correct place 2013-12-20 10:57:48 +01:00
Roman Donchenko
e49b8dee40 Merge pull request #1881 from pentschev:defaultNorm_master 2013-12-17 13:53:59 +04:00
Roman Donchenko
52a785e95a Merge pull request #1996 from SpecLad:merge-2.4 2013-12-17 13:21:48 +04:00
Roman Donchenko
9d8d70d6ca Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	doc/tutorials/definitions/tocDefinitions.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/src/system.cpp
	modules/features2d/src/freak.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/cl_context.cpp
	modules/ocl/test/test_api.cpp
 2013-12-16 15:02:12 +04:00
StevenPuttemans
e4b41d38f1 Fixed descripotorsCount to descriptorsCount 
See feature 2862
 2013-12-16 10:47:24 +01:00
sprice
1c15776cf5 Merge branch 'master' of https://github.com/Itseez/opencv 
Conflicts:
	modules/imgproc/src/sumpixels.cpp
 2013-12-11 14:35:51 -08:00
Peter Andreas Entschev
c289c8a700 Fixing some indentation issues on FREAK source file. 2013-12-10 08:57:46 -02: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
sprice
73b0827ec1 Don't automatically convert to grayscale (keep previous behavior.) 2013-12-04 18:21:56 -08:00
sprice
2cc11e2c6a Updating STAR detector and FREAK descriptor to work with large and/or 16-bit images 2013-12-04 18:13:34 -08: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
Mathieu Barnachon
fb9c59dd8d Fix default argument. 2013-11-27 18:14:37 +01:00
Mathieu Barnachon
b413bcbba4 Fix shadow parameter. 2013-11-27 11:36:34 +01:00
Mathieu Barnachon
99c8b8c016 Fix parameter name to fit documentation. 2013-11-27 11:06:52 +01:00
Mathieu Barnachon
4f74e2509b Fix the documentation names. 2013-11-26 22:50:26 +01:00
Mathieu Barnachon
c90fe65f22 Fix compilation issue related to previous commit. 2013-11-24 17:16:45 +01:00
Mathieu Barnachon
e8b86c8663 Fix name of one parameter to fit the documentation. 2013-11-24 17:14:23 +01:00
Mathieu Barnachon
9dc713eaba Fix name of parameter to have proper documentation. 2013-11-24 15:45:05 +01:00
Mathieu Barnachon
bf84d476fc Fix useless space... 2013-11-24 15:38:48 +01:00
Mathieu Barnachon
0c4da123e9 Remove duplicate functions. 2013-11-24 14:33:41 +01:00
Mathieu Barnachon
67525627db Merge remote-tracking branch 'upstream/master' into bow_desc 
Conflicts:
	modules/features2d/src/bagofwords.cpp
 2013-11-24 14:21:44 +01:00
Jose-Luis Blanco-Claraco
80e667b647 Minimized the number of arguments required to workaround the MSVC2013 compiler bug. 2013-10-21 21:43:26 +02:00
Jose-Luis Blanco-Claraco
77023e2366 Added comment to features2d_init.cpp explaining the reason for the extra parameters. 2013-10-21 21:17:15 +02: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
Ilya Lavrenov
35d9ce0c0c fixed warnings 2013-10-08 12:46:43 +04:00
Roman Donchenko
bcb6f0386e Named FastFeatureDetector::Type to allow its use in makePtr. 
It has actually worked before (likely because it's inside a class),
but C++03 does disallow unnamed types as template arguments,
and there's a report that at least in one version of GCC it's
enforced: <http://code.opencv.org/issues/3278>.
 2013-10-01 18:22:03 +04:00
Alexander Alekhin
0ee47502d9 remove CV_EXPORT from templates 2013-09-15 13:48:54 +04:00
Roman Donchenko
1eacb485c5 Boring changes - features2d. 2013-09-05 18:26:44 +04:00
Mathieu Barnachon
464985205c Update PR after mdim review. 2013-09-05 16:05:54 +12:00
Roman Donchenko
9ed475cf52 War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
Roman Donchenko
9b92545ce6 War on Whitespace, master edition: trailing spaces. 2013-08-27 13:57:24 +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
f55740da70 Deleted all trailing whitespace. 2013-08-21 18:59:24 +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
Mathieu Barnachon
43c9818895 Adding class for BOW image matcher (Feature #3005). 
Same prototype as BOWImgDescriptorExtractor, but do only the matching.
If the feature is accepted, the BOWImgDescriptorExtractor and BOWImgDescriptorMatcher should probably refactor with inheritance.
Add a class to compute the keypoints, descriptors and matching from an image should be added to.
 2013-08-18 11:32:04 +12:00
Roman Donchenko
2530b580a8 Merge branch 'master' into merge-2.4 
Conflicts:
	modules/photo/doc/inpainting.rst
 2013-08-16 14:14:12 +04:00
Roman Donchenko
8e245f8a3a Merge pull request #1186 from SpecLad:dont-export-templates 2013-08-14 17:25:01 +04:00
Roman Donchenko
6b5ac42a9b Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
	modules/features2d/doc/object_categorization.rst
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/image_filtering.rst
	modules/gpu/doc/image_processing.rst
	modules/gpu/doc/video.rst
	modules/imgproc/doc/miscellaneous_transformations.rst
	modules/imgproc/doc/object_detection.rst
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/imgproc/src/samplers.cpp
	modules/ml/doc/k_nearest_neighbors.rst
	modules/nonfree/doc/feature_detection.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/photo/doc/inpainting.rst
	modules/ts/include/opencv2/ts.hpp
	platforms/scripts/camera_build.conf
	samples/android/camera-calibration/AndroidManifest.xml
 2013-08-13 12:56:39 +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
Roman Donchenko
2f780ed994 Fix whitespace errors. 2013-08-06 18:07:00 +04:00
Roman Donchenko
dcaf923517 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	3rdparty/ffmpeg/ffmpeg_version.cmake
	cmake/OpenCVFindLibsGrfmt.cmake
	cmake/templates/cvconfig.h.cmake
	modules/bioinspired/doc/retina/index.rst
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/calib3d/src/precomp.hpp
	modules/contrib/src/inputoutput.cpp
	modules/contrib/src/precomp.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/include/opencv2/core/types_c.h
	modules/core/src/drawing.cpp
	modules/core/src/precomp.hpp
	modules/core/src/system.cpp
	modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
	modules/features2d/doc/common_interfaces_of_feature_detectors.rst
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/features2d/src/precomp.hpp
	modules/flann/src/precomp.hpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/image_filtering.rst
	modules/gpu/doc/image_processing.rst
	modules/gpu/doc/video.rst
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/perf4au/main.cpp
	modules/gpu/src/imgproc.cpp
	modules/gpu/src/precomp.hpp
	modules/gpu/test/test_imgproc.cpp
	modules/highgui/CMakeLists.txt
	modules/highgui/test/test_precomp.hpp
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/imgproc/src/precomp.hpp
	modules/java/generator/src/cpp/Mat.cpp
	modules/legacy/src/precomp.hpp
	modules/ml/doc/k_nearest_neighbors.rst
	modules/ml/src/precomp.hpp
	modules/nonfree/doc/feature_detection.rst
	modules/nonfree/src/precomp.hpp
	modules/objdetect/include/opencv2/objdetect/objdetect.hpp
	modules/objdetect/src/cascadedetect.cpp
	modules/objdetect/src/hog.cpp
	modules/objdetect/src/precomp.hpp
	modules/objdetect/test/test_latentsvmdetector.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/opencl/objdetect_hog.cl
	modules/ocl/src/precomp.hpp
	modules/photo/src/precomp.hpp
	modules/stitching/src/precomp.hpp
	modules/superres/perf/perf_precomp.hpp
	modules/superres/src/optical_flow.cpp
	modules/superres/src/precomp.hpp
	modules/superres/test/test_precomp.hpp
	modules/ts/include/opencv2/ts.hpp
	modules/video/src/precomp.hpp
	modules/videostab/src/precomp.hpp
	modules/world/src/precomp.hpp
 2013-08-06 13:56:49 +04: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
Roman Donchenko
4ac2db271d Removed CV_EXPORTS from all template classes (that I could find). 
It doesn't make sense to export template classes, since there's no way
the user can learn that it can import them. In fact, it is somewhat
deleterious, because every module will export every instantiation
that it uses, but doesn't inline.
 2013-07-25 19:40:08 +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
StevenPuttemans
194af062ff Adapted the reference underscore to link properly 2013-07-23 09:49:09 +02:00
StevenPuttemans
a92feafc49 Fixed bug 3166 - added paper reference to stardetector code 2013-07-23 08:49:25 +02:00
Roman Donchenko
3939d78336 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/include/opencv2/core/types_c.h
	modules/gpu/src/cuda/imgproc.cu
	modules/gpu/src/cuda/safe_call.hpp
	modules/gpu/src/error.cpp
	modules/gpu/src/imgproc.cpp
	modules/imgproc/src/distransform.cpp
	modules/imgproc/src/shapedescr.cpp
	modules/python/src2/cv2.cpp
	modules/python/src2/cv2.cv.hpp
 2013-07-22 18:38:57 +04:00
StevenPuttemans
52bfa7b850 Fixed bug 1873 : return image keypoint descriptors + fix on line 152 pure declaration 2013-07-19 09:29:48 +02:00
Roman Donchenko
feaa12a274 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/include/opencv2/core/version.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/initialization.cpp
	modules/ocl/test/main.cpp
	modules/superres/CMakeLists.txt
	modules/superres/src/input_array_utility.cpp
	modules/superres/src/input_array_utility.hpp
	modules/superres/src/optical_flow.cpp
 2013-07-16 11:52:41 +04:00
abidrahmank
1923d87f61 PyDocs for common interface of feature2d 2013-07-11 09:33:32 +05:30
abidrahmank
f91f369788 PyDocs for FAST, ORB etc 2013-07-11 09:32:49 +05:30
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