mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-19 03:58:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
24,188 Commits 6 Branches 127 Tags 3 GiB
df38624e10
Commit Graph

156 Commits

Author SHA1 Message Date
Roman Donchenko
ac39bfb4cc Remove HAVE_CVCONFIG_H - it's always defined. 2013-07-10 16:02:07 +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
4c9773d55f renamed gpu headers (made it more consistent) 2013-06-10 12:40:30 +04:00
Vladislav Vinogradov
3eeaa9189c Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-07 13:05:39 +04:00
Uwe Kindler
ca42a50de6 Changed visibility of the virtual functions in OnePassStabilizer and TwoPassStabilizer that are derived from StabilizerBase from private to protected to enable stabilizer implementations that are derived from OnePassStabilizer and TwoPassStabilier to properly overwrite these functions 2013-04-24 07:33:22 +02: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
0738ea7d0f Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
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
75513a46dc Remove all include directives for <string> 2013-03-22 22:14:47 +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
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
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
Andrey Kamaev
11bd936f0b Fix warnings from documentation build 2013-02-20 15:07:13 +04:00
Andrey Kamaev
e63b4591ff Suppress clang build warning 2013-01-31 16:01:04 +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
Andrey Kamaev
73bbabf207 Eliminate discrepancies between signatures in documentation and OpenCV headers 
All errors were found by doc/check_docs2.py
 2012-10-18 13:03:12 +04:00
Andrey Kamaev
0e7ca71dcc Normalize whitespace in documentation and text files 2012-10-17 21:42:09 +04:00
OpenCV Buildbot
81f826db2b Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
Andrey Kamaev
0442bca235 Revert "partially recovered binary compatibility (ticket #2415)" 
This reverts commit 94b97b7a63.
 2012-10-16 19:37:12 +04:00
Vladislav Vinogradov
ece77e3930 fixed cvtColor parameter in KeypointBasedMotionEstimatorGpu::estimate 2012-10-10 16:07:07 +04:00
Vadim Pisarevsky
94b97b7a63 partially recovered binary compatibility (ticket #2415) 2012-10-08 17:06:05 +04:00
Alexey Spizhevoy
2ec264303e Added initial docs for the videostab module 2012-10-05 21:33:00 +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
afe11f69fb Fixed Windows build warnings and configuration problem. 2012-06-30 20:45:01 +00:00
Andrey Kamaev
a71797c0c4 Reverted some changes in videostab module 2012-06-28 17:48:53 +00:00
Marina Kolpakova
162f9fd7ea merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811 2012-06-28 17:07:17 +00:00
Andrey Kamaev
a323da6fd5 Fixed some warnings and install problems on linux 2012-06-27 12:02:31 +00:00
Andrey Kamaev
ecf6b5a87c Making all dependencies from highgui module optional 2012-06-26 07:29:36 +00: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
Andrey Kamaev
49a1ba6038 Set stricter warning rules for gcc 2012-06-07 17:21:29 +00:00
Andrey Kamaev
eb90882b2d Fixed some build warnings 2012-05-25 13:13:51 +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
24be840c44 Added GPU version of wobble suppressor (videostab) 2012-04-23 10:37:07 +00:00
Alexey Spizhevoy
36ef599840 Fixed trim ratio estimation for the case of homographies motion model (videostab) 2012-04-23 06:42:55 +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
f355f798a4 Minor changes in videostab module and sample 2012-04-19 10:27:17 +00:00
Alexey Spizhevoy
f42eea1029 Added timing for main steps (videostab) 2012-04-19 09:29:13 +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
4c44ccc3c9 Removed unnecessary code (videostab) 2012-04-17 09:30:16 +00:00
Alexey Spizhevoy
dfedaff99b Removed unnecessary code (videostab) 2012-04-17 09:21:09 +00:00
Alexey Spizhevoy
19c30eaa11 Refactored videostab module 2012-04-17 09:12:14 +00:00
Alexey Spizhevoy
0824cf5059 Added info about papers (videostab) 2012-04-16 11:45:08 +00:00
Alexey Spizhevoy
306248e444 Added support of Clp for Windows 2012-04-16 11:10:41 +00:00
Alexey Spizhevoy
601d2843f4 Fixed LP based stabilizer 2012-04-16 07:08:28 +00:00
Alexey Spizhevoy
40e7990b6b Added linear programming based stabilizer (videostab) 2012-04-16 06:41:06 +00:00
Vadim Pisarevsky
2fd1e2ea57 merged all the latest changes from 2.4 to trunk 2012-04-13 21:50:59 +00:00
Andrey Kamaev
97835a8f32 Fixed 9 more build warnings 2012-04-12 16:21:08 +00:00
Alexey Spizhevoy
cc0ecf9123 Removed unnecessary line (videostab) 2012-04-12 13:58:25 +00:00
Alexey Spizhevoy
df410ce246 Removed unnecessary line (videostab) 2012-04-12 13:57:28 +00:00
Alexey Spizhevoy
9d871abd32 Refactored videostab module. Added normalization into motion estimators. 2012-04-11 14:02:10 +00:00
Alexey Spizhevoy
ae839df55d Added WITH_CLP flag support into cmake scripts. 2012-04-11 12:34:30 +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
Andrey Kamaev
626afecaf8 Fixed couple of MSVC warnings 2012-04-10 22:21:12 +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
39cd13583f Fixed bug in motion stabilization pipeline and updated wobble stabilizer (videostab) 2012-04-09 11:58:56 +00:00
Andrey Kamaev
7cc7a3f37d Suppressed hundreds of useless MSVC warnings (can be reenabled setting cmake variable ENABLE_NOISY_WARNINGS to ON). Fixed some of remaining warnings. 2012-04-08 21:49:19 +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
f32b645b96 Refactored videostab module, added base class for woobble suppression 2012-04-05 09:15:13 +00:00
Andrey Pavlenko
dc8c281fa1 fixing compilation 2012-04-05 05:02:24 +00:00
Alexey Spizhevoy
a7da9681c3 Added motion stabilization pipeline (videostab module) 2012-04-04 13:58:38 +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
56b5e6d8a8 Updated videostab module 2012-04-02 12:26:05 +00:00
Alexey Spizhevoy
3e23bb6df6 Refactored videostab module and sample 2012-04-02 09:25:27 +00:00
Alexey Spizhevoy
99f29b75a1 Added linear similarity estimation into videostab module 2012-03-30 09:44:32 +00:00
Alexey Spizhevoy
45fd8a6a63 Added load and save motion args into videostab sample 2012-03-22 09:30:28 +00:00
Andrey Kamaev
e64c08d5d9 Fixed build 2012-03-22 08:22:23 +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
Alexey Spizhevoy
faf845d31f Fixed warning 2012-03-21 08:37:24 +00:00
Alexey Spizhevoy
3323ee9d18 Added distance threshold argument into videostab sample 2012-03-21 08:34:00 +00:00
Alexey Spizhevoy
8fc84b7a41 Updated FMM run() signature 2012-03-21 07:53:36 +00:00
Alexey Spizhevoy
5e2bcacba5 Fixed some warnings 2012-03-21 07:35:25 +00:00
Alexey Spizhevoy
23398bcb95 Fixed some warnings 2012-03-20 12:46:23 +00:00
Alexey Spizhevoy
dcb5464b3c Added more inpainting methods. Fixed some errors. 2012-03-20 12:24:51 +00:00
Andrey Pavlenko
f1cf411ffe fixing compilation on Windows 2012-03-20 09:18:59 +00:00
Alexey Spizhevoy
be73f8e29c Added quiet mode into videostab sample 2012-03-20 08:12:58 +00:00
Alexey Spizhevoy
e4651fa697 Fixed ensureInclusionConstraint 2012-03-20 07:30:07 +00:00
Alexey Spizhevoy
bde7456256 Updated videostab sample 2012-03-20 06:52:52 +00:00