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