Vladislav Vinogradov
0c7663eb3b
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudacodec/src/thread.cpp
modules/cudacodec/src/thread.hpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
2013-09-06 15:44:44 +04:00
Vladislav Vinogradov
ae94256edc
renmaed gpu module -> cuda
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
5660d6a680
renamed gpuoptflow -> cudaoptflow
2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
a0ae602bb7
renamed gpuimgproc -> cudaimgproc
2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
e895b7455e
renamed gpu namespace -> cuda
2013-09-02 14:00:41 +04:00
Roman Donchenko
9ed475cf52
War on Whitespace, master edition: file endings.
2013-08-27 14:23:26 +04:00
Vladislav Vinogradov
70e6dc615a
refactored GoodFeaturesToTrackDetector
2013-07-17 11:39:56 +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
de4c3f0178
Fixed a bug related to video stabilization crashes with a blank video (Bug #3023 )
2013-06-13 13:41:43 +04:00
Vladislav Vinogradov
3eeaa9189c
Revert "Revert "Merge pull request #836 from jet47:gpu-modules""
2013-06-07 13:05:39 +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
13d087e62d
videostab module fixes
2013-04-18 13:28:34 +04:00
Andrey Kamaev
e5a33723fc
Move C API of opencv_calib3d to separate file
2013-04-11 21:00:17 +04:00
Andrey Kamaev
199a35a105
Move C API of opencv_video to separate file
2013-04-11 17:38:33 +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
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
ece77e3930
fixed cvtColor parameter in KeypointBasedMotionEstimatorGpu::estimate
2012-10-10 16:07:07 +04:00
Ivan Korolev
a8ba2d7f52
Added Rotation motion mode in the videostab module
2012-09-21 17:04:28 +04:00
Alexey Spizhevoy
f3bc1aede1
removed obsolte global motion estimation method
2012-09-21 10:46:21 +04:00
Alexey Spizhevoy
c8b7a8c80c
added median-based version of global motion estimation (videostab)
2012-08-23 10:48:24 +04:00
Andrey Kamaev
bd0e0b5800
Merged the trunk r8589:8653 - all changes related to build warnings
2012-06-15 13:04:17 +00:00
Andrey Kamaev
c5aba337e9
Fixed number of warnings. Fixed mingw64 build.
2012-06-12 14:46:12 +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
Alexey Spizhevoy
30431b94d9
Replaced CV_RANSAC in findHomography with CV_LMEDS (videostab)
2012-04-27 12:38:33 +00:00
Alexey Spizhevoy
2799f51bf9
Minor changes in videostab module
2012-04-26 11:56:30 +00:00
Alexey Spizhevoy
02d34bdac2
Refactored videostab module
2012-04-26 09:01:15 +00:00
Alexey Spizhevoy
2270c2f5bd
Refactored videostab module
2012-04-26 07:11:01 +00:00
Alexey Spizhevoy
71391eb76f
Added LP based global motion estimation (videostab)
2012-04-25 13:21:38 +00:00
Alexey Spizhevoy
95efec7539
Added local outlier rejector. Added rigid motion estimator. Refactored videostab module.
2012-04-24 12:23:23 +00:00
Alexey Spizhevoy
ae8d377561
Replaced DECOMP_SVD with DECOMP_NORMAL|DECOMP_LU for speed (videostab)
2012-04-20 09:02:39 +00:00
Alexey Spizhevoy
536d36b05a
Refactoring (videostab)
2012-04-18 17:00:07 +00:00
Alexey Spizhevoy
1569c1ed52
Added GPU version of PyrLK based global motion estimator (videostab)
2012-04-18 13:23:41 +00:00
Alexey Spizhevoy
19c30eaa11
Refactored videostab module
2012-04-17 09:12:14 +00:00
Alexey Spizhevoy
306248e444
Added support of Clp for Windows
2012-04-16 11:10:41 +00:00
Alexey Spizhevoy
40e7990b6b
Added linear programming based stabilizer (videostab)
2012-04-16 06:41:06 +00:00
Alexey Spizhevoy
9d871abd32
Refactored videostab module. Added normalization into motion estimators.
2012-04-11 14:02:10 +00:00
Andrey Kamaev
b756033206
Fixed several warnings on various platforms
2012-04-11 11:11:39 +00:00
Alexey Spizhevoy
b5a1bad7a4
Added more flags for motion estimation in videostab sample
2012-04-11 10:17:35 +00:00
Alexey Spizhevoy
b549900fe1
Minor fixes and updates in videostab module and sample
2012-04-10 10:33:19 +00:00
Alexey Spizhevoy
673f879ccd
Fixed bug in videostab sample. Fixed model size in global estimators.
2012-04-10 09:07:30 +00:00
Alexey Spizhevoy
d9d4755387
Updated wobble suppression code in videostab module
2012-04-06 08:52:31 +00:00
Alexey Spizhevoy
fa09f3d121
Refactored videostab module. Added MoreAccurateMotionWobbleSuppressor class
2012-04-05 13:23:42 +00:00
Alexey Spizhevoy
9c44715f50
Added asserts into global motion estimation functions (videostab module)
2012-04-04 11:49:48 +00:00
Alexey Spizhevoy
efa0717d01
Added support of homography estimation into videostab module
2012-04-04 11:45:16 +00:00
Alexey Spizhevoy
ecb1f0e288
Fixed some bugs in videostab module and refactored it
2012-04-04 09:28:47 +00:00
Alexey Spizhevoy
99f29b75a1
Added linear similarity estimation into videostab module
2012-03-30 09:44:32 +00:00
Alexey Spizhevoy
984583981c
Split stabilizer into OnePassStabilizer and TwoPassStabilizer
2012-03-22 07:52:17 +00:00
Alexey Spizhevoy
68f26cca78
Refactored videostab module
2012-03-21 09:34:27 +00:00