3eeaa9189c
Revert "Revert "Merge pull request #836 from jet47:gpu-modules""
2013-06-07 13:05:39 +04:00
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
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
416fb50594
Revert "Merge pull request #836 from jet47:gpu-modules"
...
This reverts commit fba72cb60d02131ffb62
2013-04-18 15:03:50 +04:00
fdeec6896c
stitching module fixes
2013-04-18 13:28:30 +04:00
e5a33723fc
Move C API of opencv_calib3d to separate file
2013-04-11 21:00:17 +04:00
288a0634c2
Make imgproc.hpp independent from C API
2013-04-08 15:47:28 +04:00
67073daf19
Merge branch '2.4'
2013-04-05 21:11:59 +04:00
69127e4105
some typo
2013-04-04 22:54:27 +05:30
2b1e13f8f4
changed surfFeaturesFinder::find() to allow CV_8UC1 type images
...
http://code.opencv.org/issues/2926
2013-04-04 22:52:07 +05:30
1ca8f33b4e
Merge branch '2.4'
2013-03-21 23:11:54 +04:00
0a65f2f4af
merged gpunonfree and nonfree module
2013-03-18 16:14:37 +04:00
fd7bf0b766
moved SURF_GPU and VIBE to gpunonfree module
2013-03-18 14:06:29 +04:00
d9cd753835
Merge pull request #645 from taka-no-me:bump_headers
2013-03-14 11:42:23 +04:00
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
55698548dd
Avoid assert in lapac.cpp if findHomography fails in BestOf2NearestMatcher::match
2013-03-12 22:49:40 +04:00
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
8b1f88c40f
updated gpu module API
2013-02-21 16:12:33 +04:00
94c310fc14
added Ptr::operator==
2012-12-15 22:48:50 +04:00
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
e5437e5486
Fix binary compatibility of opencv_gpu
2012-10-17 02:09:40 +04:00
2b6b6f12e2
Debug message is turned off
2012-06-29 08:47:38 +00:00
d48d7b2b46
Updated warning options for GCC; fixed new warnings.
2012-06-20 12:27:02 +00:00
f2d3b9b4a1
Warning fixes continued
2012-06-09 15:00:04 +00:00
44eaeee865
refactored gpu BruteForceMather (made it similar to BFMatcher)
2012-04-24 07:56:33 +00:00
5c615ec28f
added optional dependency stitching->nonfree. When nonfree is available, make sure linker does not throw it away.
2012-03-31 17:25:19 +00:00
e87a07e2aa
Fixed bug #1693 . Also corrected default parameters for stitching.
2012-03-19 11:51:18 +00:00
4985c1b632
fixed hundreds of warnings from MSVC 2010.
2012-03-16 21:21:04 +00:00
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
9794f5977c
Changed the class OrbFeaturesFinder to make it work with CV_8UC4 and CV_8UC1 images.
2012-02-27 17:46:53 +00:00
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
2395654cbf
Made changes in the stitching log macros: now the function stitchingLogLevel() may be used to make the stitching classes more/less verbose.
2012-01-24 11:56:32 +00:00
6d8f4c6b82
Added small debug insertion.
2011-12-26 12:34:28 +00:00
b720eddd9e
Tegra-optimized features matching for Stitching
2011-10-27 14:06:06 +00:00
94f72ae876
Stitching: added grid option to OrbFeaturesFinder
2011-10-21 08:40:10 +00:00
f299bde3a9
Added ORB features finder into stitching module
2011-10-19 10:48:45 +00:00
d3c4e90760
new optimized implementation of BruteForceMatcher_GPU (~2-3x faster)
2011-10-12 10:23:03 +00:00
ee413b8026
Avoid duplicated surf extraction step when same parameters are used for detection and descriptors calculation
2011-10-03 08:44:28 +00:00
c5357cc17c
Added fix for removing too similar images into the stitching module
2011-09-30 12:46:11 +00:00
e0bf60fd3e
Minor changes in stitching module
2011-09-27 07:46:28 +00:00
e99b090871
Fixed bug in ROI based features finder (stitching)
2011-09-26 13:17:06 +00:00
a7d053f10d
Added handling of ROI in stitching features matchers
2011-09-26 09:59:13 +00:00
b053a3b486
Added matching mask into pairwise matcher from stitching module
2011-09-26 09:24:45 +00:00
a72da12c80
Added fix for 0 found features in stitching matcher
2011-09-13 14:15:18 +00:00
cbb6ac0c34
refactored features finders in stitching module
2011-09-07 12:48:48 +00:00
c9a41c6802
added first version of public stitching API, added simple sample which uses that API, old sample renamed to stitching_detailed
2011-09-07 11:14:27 +00:00
52184c8803
Gpu functionality in stitching module is excluded from Android build
2011-09-07 08:59:39 +00:00
95a3ffd0c5
put all old stitching API into detail namespace
2011-09-07 06:34:22 +00:00
bf0081a850
fixed bug in stitching in GpuSurfFeaturesFinder (missing upright parameter)
2011-09-07 06:19:21 +00:00
Vladislav Vinogradov