mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-04 08:49:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
23,778 Commits 6 Branches 126 Tags 3 GiB
44848d3241
Commit Graph

224 Commits

Author SHA1 Message Date
Vladislav Vinogradov
259ceb7eaa renamed gpufeatures2d -> cudafeatures2d 2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
d4901a99ea renamed gpuwarping -> cudawarping 2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
dcd600cc47 renamed gpuarithm -> cudaarithm 2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
e895b7455e renamed gpu namespace -> cuda 2013-09-02 14:00:41 +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
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
Miroslav Kobetski
b595d73d6d defined uint for non-windows platforms too. replaced isnan for cvIsNaN. 2013-08-14 17:16:52 +02: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
Roman Donchenko
ac39bfb4cc Remove HAVE_CVCONFIG_H - it's always defined. 2013-07-10 16:02:07 +04:00
Alexey Spizhevoy
2a48f7c035 fixed include for Windows 2013-07-05 09:44:32 +04:00
Alexey Spizhevoy
027065a5a1 removed trailing whitespaces causing warnings 2013-07-04 17:31:12 +04:00
Alexey Spizhevoy
cc85e86ee7 fixed Windows build 2013-07-04 17:22:36 +04:00
Alexey Spizhevoy
438a599288 added 'cmath' include 2013-07-04 16:57:20 +04:00
Alexey Spizhevoy
37ea872204 added handling of camera parameters estimation errors (#3122) 2013-07-03 15:20:14 +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
Ivan Korolev
58fa401b4d Fixed a bug #2405 2013-06-14 10:43:20 +04:00
Roman Donchenko
41482fe56c Erase MatchPairsBody's copy constructor. 
It's the same as the implicitly defined one, and it causes a -Wextra warning
(not initializing the base class in a copy constructor).
 2013-06-10 13:30:23 +04:00
Vladislav Vinogradov
3eeaa9189c Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-07 13:05: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
Andrey Kamaev
416fb50594 Revert "Merge pull request #836 from jet47:gpu-modules" 
This reverts commit fba72cb60d, reversing
changes made to 02131ffb62.
 2013-04-18 15:03:50 +04:00
Vladislav Vinogradov
fdeec6896c stitching module fixes 2013-04-18 13:28:30 +04:00
Andrey Kamaev
e5a33723fc Move C API of opencv_calib3d to separate file 2013-04-11 21:00:17 +04:00
Andrey Kamaev
288a0634c2 Make imgproc.hpp independent from C API 2013-04-08 15:47:28 +04:00
Andrey Kamaev
67073daf19 Merge branch '2.4' 2013-04-05 21:11:59 +04:00
Gurpinder Singh Sandhu
69127e4105 some typo 2013-04-04 22:54:27 +05:30
Gurpinder Singh Sandhu
2b1e13f8f4 changed surfFeaturesFinder::find() to allow CV_8UC1 type images 
http://code.opencv.org/issues/2926
 2013-04-04 22:52:07 +05:30
Andrey Kamaev
517062039e Make core/internal.hpp a private header 2013-04-01 17:29:10 +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
2ad7b97f1c All modules (except ocl and gpu) compiles and pass tests 2013-03-22 22:14:26 +04:00
Andrey Kamaev
1ca8f33b4e Merge branch '2.4' 2013-03-21 23:11:54 +04:00
Vladislav Vinogradov
0a65f2f4af merged gpunonfree and nonfree module 2013-03-18 16:14:37 +04:00
Vladislav Vinogradov
fd7bf0b766 moved SURF_GPU and VIBE to gpunonfree module 2013-03-18 14:06:29 +04:00
Andrey Kamaev
d9cd753835 Merge pull request #645 from taka-no-me:bump_headers 2013-03-14 11:42:23 +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
55698548dd Avoid assert in lapac.cpp if findHomography fails in BestOf2NearestMatcher::match 2013-03-12 22:49:40 +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
Vladislav Vinogradov
8b1f88c40f updated gpu module API 2013-02-21 16:12:33 +04:00
Andrey Kamaev
13b6a3a15e Merge branch 2.4 2012-12-24 17:10:07 +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
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
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
marina.kolpakova
e5437e5486 Fix binary compatibility of opencv_gpu 2012-10-17 02:09:40 +04:00
Andrey Kamaev
4a53199e7a Quiet logs in stitching module 2012-10-09 19:28:15 +04:00
Alexey Spizhevoy
cb705aad1a updated DP seaming to support 4 channel images 2012-10-08 14:29:10 +04:00
Alexey Spizhevoy
eafb024112 fixed one of the log messages in the stitching module 2012-09-28 14:37:38 +04:00
Alexey Spizhevoy
317a27e9eb fixed the bug #2385 2012-09-25 16:08:43 +04:00
Vadim Pisarevsky
633a8bfacc fixed many warnings (modified pull request 13) 2012-08-28 18:15:14 +04:00
Andrey Kamaev
1a621c2916 Fix build warnings 2012-08-19 19:36:43 +04:00
Alexey Spizhevoy
8c3984c5ff Refactored the DP based seam finder 2012-08-07 23:55:06 +04:00
alexey.spizhevoy
43d46c0e8b Minor fix in the DP based seam estimator 2012-08-07 16:24:21 +04:00
alexey.spizhevoy
7222f2724f Fixed bug 2012-08-07 16:24:21 +04:00
alexey.spizhevoy
85d1c463b9 Minor changes 2012-08-07 16:24:21 +04:00
alexey.spizhevoy
897c2bbd14 Added support of 8UC3 2012-08-07 16:24:21 +04:00
alexey.spizhevoy
a39bce204d implemented DP-based seam estimation method 2012-08-07 16:24:21 +04:00
Andrey Kamaev
2b6b6f12e2 Debug message is turned off 2012-06-29 08:47:38 +00:00
Andrey Kamaev
d48d7b2b46 Updated warning options for GCC; fixed new warnings. 2012-06-20 12:27:02 +00:00
Andrey Kamaev
f2d3b9b4a1 Warning fixes continued 2012-06-09 15:00:04 +00:00
Andrey Kamaev
2f40905548 Fixed Android build 2012-06-08 08:11:17 +00:00
Andrey Kamaev
f62028dc16 Fixed mingw build. 2012-06-08 03:15:08 +00:00
Vadim Pisarevsky
d5a0088bbe merged 2.4 into trunk 2012-04-30 14:33:52 +00:00
Vladislav Vinogradov
44eaeee865 refactored gpu BruteForceMather (made it similar to BFMatcher) 2012-04-24 07:56:33 +00:00
Vadim Pisarevsky
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
Alexey Spizhevoy
e87a07e2aa Fixed bug #1693. Also corrected default parameters for stitching. 2012-03-19 11:51:18 +00:00
Vadim Pisarevsky
4985c1b632 fixed hundreds of warnings from MSVC 2010. 2012-03-16 21:21:04 +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
3df41c1d62 Tegra version of cv::detail:: 2012-03-12 11:24:27 +00:00
Andrey Kamaev
4ebb66362c Tegra version of cv::detail::createLaplacePyr 2012-03-11 14:53:13 +00:00
Alexander Shishkov
466345e936 fixed stitching compilation 2012-03-08 08:10:04 +00:00
Andrey Kamaev
49207ce1a0 Minor fix in blender mask conversion. 2012-03-07 20:33:35 +00:00
Andrey Kamaev
679f1dad99 Stitching: added CV_16S weights support to the multiband blender 2012-03-07 14:23:55 +00:00
Leonid Beynenson
9794f5977c Changed the class OrbFeaturesFinder to make it work with CV_8UC4 and CV_8UC1 images. 2012-02-27 17:46:53 +00:00
Leonid Beynenson
b8eeb019db Added spherical and cylindrical warpers, which work in the portrait mode -- when poles are located NOT at (0, -1, 0) and (0, 1, 0) points, BUT at (1, 0, 0) and (-1, 0, 0) points. 2012-02-22 15:44:39 +00:00
Vladislav Vinogradov
2d30480982 created wrappers for new NPP functions 
removed void integral(const GpuMat& src, GpuMat& sum, GpuMat& sqsum, Stream& stream) - it fails with NPP_NOT_IMPLEMENTED error
updated docs, accuracy and performance tests
 2012-02-22 10:00:53 +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
Leonid Beynenson
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
Leonid Beynenson
6d8f4c6b82 Added small debug insertion. 2011-12-26 12:34:28 +00:00
Alexey Spizhevoy
b4f17ab79e Updated motions estimators in the stitching module to be able to set camera intrinsics manually 2011-12-22 09:59:03 +00:00
Leonid Beynenson
0b907d088d Made changes in BundleAdjusterBase class to pass a termination criteria to the Levenberg–Marquardt algorithm. 2011-12-01 13:35:07 +00:00
Vladislav Vinogradov
09ba133ddf prepared GpuMat for moving to core module 2011-10-31 08:51:00 +00:00
Andrey Kamaev
b720eddd9e Tegra-optimized features matching for Stitching 2011-10-27 14:06:06 +00:00
Andrey Kamaev
f1cb2431b8 Fixed small bugs in Stitcher class 2011-10-25 12:42:08 +00:00
Alexey Spizhevoy
28e006ad4f Fixed median focal length estimation in the stitching module 2011-10-24 12:35:11 +00:00
Alexey Spizhevoy
b8304ce764 Updated stitcher a little bit 2011-10-21 10:47:48 +00:00
Andrey Kamaev
94f72ae876 Stitching: added grid option to OrbFeaturesFinder 2011-10-21 08:40:10 +00:00
Andrey Kamaev
f299bde3a9 Added ORB features finder into stitching module 2011-10-19 10:48:45 +00:00
Vladislav Vinogradov
d3c4e90760 new optimized implementation of BruteForceMatcher_GPU (~2-3x faster) 2011-10-12 10:23:03 +00:00
Alexey Spizhevoy
9047ef2cdf Renamed warp of point method into warpPoint 2011-10-07 08:51:01 +00:00
Alexey Spizhevoy
a7fbcad283 Added warp method into the RotationWarper interface, added find() into VoronoiSeamFinder which uses only source image sizes 2011-10-07 08:17:55 +00:00
Alexey Spizhevoy
74561c5b8e Added createWightMaps function into FeatherBlender (stitching) 2011-10-03 09:44:30 +00:00
Andrey Kamaev
ee413b8026 Avoid duplicated surf extraction step when same parameters are used for detection and descriptors calculation 2011-10-03 08:44:28 +00:00
Alexey Spizhevoy
dce50b67fc Fixed support of translation in the GPU-based plane warper 2011-10-03 07:42:16 +00:00
Alexey Spizhevoy
607a7fd2c2 Updated GPU warpers interface 2011-10-03 07:10:15 +00:00
Alexey Spizhevoy
404e9cb9d5 Refactored warpers in the stitching module, added buildMaps function into the RotationWarper interface 2011-10-03 06:31:24 +00:00
Alexey Spizhevoy
c5357cc17c Added fix for removing too similar images into the stitching module 2011-09-30 12:46:11 +00:00
Alexey Spizhevoy
e0bf60fd3e Minor changes in stitching module 2011-09-27 07:46:28 +00:00
Alexey Spizhevoy
e99b090871 Fixed bug in ROI based features finder (stitching) 2011-09-26 13:17:06 +00:00
Andrey Kamaev
961dc4e348 Fixed build error (Linux) 2011-09-26 11:05:56 +00:00
Alexey Spizhevoy
a7d053f10d Added handling of ROI in stitching features matchers 2011-09-26 09:59:13 +00:00
Alexey Spizhevoy
b053a3b486 Added matching mask into pairwise matcher from stitching module 2011-09-26 09:24:45 +00:00
Alexey Spizhevoy
551113292b Refactored stitching module 2011-09-26 08:52:31 +00:00
Alexey Spizhevoy
66b41b67f9 Added support of GPU in stitching seam estimators 2011-09-26 07:57:05 +00:00
Alexey Spizhevoy
16f5c67914 Added support of vertical straightening into stitching 2011-09-24 08:20:13 +00:00
Alexey Spizhevoy
48dec9c03a Fixed GPU version of multi-band blending in stitching module 2011-09-24 05:58:29 +00:00
Alexey Spizhevoy
afc894db9f Replaced SVD with eigenval decomposition in waveCorrect func (stitching) 2011-09-23 10:57:20 +00:00
Alexey Spizhevoy
39533a0b1b Added BA refinement flags into stitching_detailed 2011-09-22 08:58:48 +00:00
Alexey Spizhevoy
4ee462c961 Added selction of BA cost function in stitching samples (and added other BA cost func into stitching module) 2011-09-21 13:22:12 +00:00
Alexey Spizhevoy
dbce155874 Refactored motion estimators in stitching module 2011-09-21 12:13:07 +00:00
Alexey Spizhevoy
4a5abc7552 Added translation parameter into stitching module warpers. For now only PlaneWarper and PlaneWarperGpu warpers support it. 2011-09-21 10:53:23 +00:00
Alexey Spizhevoy
07efb17d12 Fixed warper selection bug in stitching_detailed. Removed estimation of aspect ratio in BA in stitching to avoid stretching of input images. Did minor refactoring. 2011-09-19 06:22:40 +00:00
Alexey Spizhevoy
23636433d7 Updated bundle adjustment in stitching module: 1) it minimizes reprojection error now, 2) it minimizes error over focal, aspect, p.p.x, p.p.y parameters. Refactored and updated warpers. 2011-09-16 12:25:23 +00:00
Alexey Spizhevoy
a72da12c80 Added fix for 0 found features in stitching matcher 2011-09-13 14:15:18 +00:00
Alexey Spizhevoy
cbb6ac0c34 refactored features finders in stitching module 2011-09-07 12:48:48 +00:00
Alexey Spizhevoy
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
Andrey Kamaev
52184c8803 Gpu functionality in stitching module is excluded from Android build 2011-09-07 08:59:39 +00:00
Alexey Spizhevoy
95a3ffd0c5 put all old stitching API into detail namespace 2011-09-07 06:34:22 +00:00
Vladislav Vinogradov
bf0081a850 fixed bug in stitching in GpuSurfFeaturesFinder (missing upright parameter) 2011-09-07 06:19:21 +00:00
Alexey Spizhevoy
fbe2e6fb01 refactored stitching module 2011-09-05 11:52:30 +00:00
Alexey Spizhevoy
9be4701f24 turned opencv_stitching application to module and sample 2011-09-05 10:41:54 +00:00