Commit Graph

34 Commits

Author SHA1 Message Date
Vadim Pisarevsky
d6c699c014 calib3d module in opencv is split into 3 modules: 3d, calib and stereo.
stereo module in opencv_contrib is renamed to xstereo
2020-12-01 23:42:15 +03:00
Maksim Shabunin
82aff110b7 cmake: allow providing list of extra modules paths 2018-02-01 19:02:02 +03:00
Maksim Shabunin
1b0ff57562 Merge pull request #10621 from mshabunin:disable-docs
Documentation generation refactoring (#10621)

* Documentation build updates:

- disable documentation by default, do not add to ALL target
- combine Doxygen and Javadoc
- optimize Doxygen html

* javadoc: fix path in build directory

* cmake: fix "Documentation" status line
2018-01-18 16:37:19 +03:00
Alexander Alekhin
55188fe991 world fix 2014-08-05 20:12:35 +04:00
Roman Donchenko
3bfc69740b Merge remote-tracking branch 'origin/2.4' into merge-2.4
Merged pull requests:
	#890 from caorong:patch-1
	#893 from jet47:gpu-arm-fixes
	#933 from pengx17:2.4_macfix_cont
	#935 from pengx17:2.4_filter2d_fix
	#936 from bitwangyaoyao:2.4_perf
	#937 from bitwangyaoyao:2.4_fixPyrLK
	#938 from pengx17:2.4_surf_sample
	#939 from pengx17:2.4_getDevice
	#940 from SpecLad:autolock
	#941 from apavlenko:signed_char
	#946 from bitwangyaoyao:2.4_samples2
	#947 from jet47:fix-gpu-arm-build
	#948 from jet47:cuda-5.5-support
	#952 from SpecLad:jepg
	#953 from jet47:fix-bug-3069
	#955 from SpecLad:symlink
	#957 from pengx17:2.4_fix_corner_detector
	#959 from SpecLad:qt4-build
	#960 from SpecLad:extra-modules

Conflicts:
	modules/core/include/opencv2/core/core.hpp
	modules/gpu/CMakeLists.txt
	modules/gpu/include/opencv2/gpu/device/vec_math.hpp
	modules/gpu/perf/perf_video.cpp
	modules/gpuimgproc/src/cuda/hough.cu
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/pyrlk.cpp
	samples/gpu/driver_api_multi.cpp
	samples/gpu/driver_api_stereo_multi.cpp
	samples/ocl/surf_matcher.cpp
2013-06-10 18:18:01 +04:00
Roman Donchenko
a954d3630f Add support for adding custom OpenCV modules. 2013-06-05 18:10:44 +04:00
Andrey Kamaev
a42a0f5fca Added compatibility headers 2013-03-13 17:26:56 +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
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
Andrey Kamaev
9d5c24cdc8 Updating opencv module definition in cmake (continued) 2012-01-25 09:04:49 +00:00
Andrey Kamaev
52184c8803 Gpu functionality in stitching module is excluded from Android build 2011-09-07 08:59:39 +00:00
Andrey Kamaev
5cce038958 Performance testing branch is merged back into trunk 2011-09-06 15:30:28 +00:00
Artem Myagkov
8c6782300a modified highgui and ts modules and cmakelists for ios cross-compiling, added ios toolchains, added ios build tutorial 2011-08-23 11:19:58 +00:00
Vadim Pisarevsky
569b1ad582 embeded cv Python module into cv2. 2011-07-12 12:56:03 +00:00
Vadim Pisarevsky
b33224f0b6 merged the latest fixes in 2.3 to trunk 2011-07-04 16:18:12 +00:00
Andrey Kamaev
730622178b Turned off android camera and java wrappers for low Android API levels (android-8 is required for these components) 2011-07-04 11:41:39 +00:00
Andrey Kamaev
69b79f89c1 Updated build scripts for better Java module support 2011-06-24 07:48:04 +00:00
Andrey Kamaev
b5d73111eb Added new module for Java API 2011-06-23 15:51:51 +00:00
Andrey Kamaev
206aa50f86 Added Android native camera module 2011-06-16 18:00:41 +00:00
Alexander Shishkov
bce15cb6dd added new version of ffmpeg binary for compilation on Mingw64/MSVC64 2011-06-14 08:06:55 +00:00
Vladislav Vinogradov
336989f80b added image stitching module 2011-05-04 11:09:42 +00:00
Andrey Kamaev
727fbd5376 Android cmake toolchain file is included into OpenCV 2011-05-03 08:13:50 +00:00
Andrey Kamaev
c122b7e114 Fixed tests compilation issue with low Android API levels. OpenCV successfully compiles for API level 3 and above.
Enable tests for Android by default.
2011-04-30 10:38:24 +00:00
Ethan Rublee
17b11a47bf Conditional for the module ts, depending on whether tests are being built. 2011-04-29 21:00:10 +00:00
Andrey Kamaev
b906ad3108 Test system included into Android build 2011-04-11 14:47:06 +00:00
Andrey Kamaev
68534d70f3 Merged android-experimental branch back to trunk. 2011-04-06 14:31:03 +00:00
Vadim Pisarevsky
061b49e0b2 reworked nearly all of the OpenCV tests (except for opencv_gpu tests) - they now use the Google Test engine. 2011-02-09 20:55:11 +00:00
Vadim Pisarevsky
97d9a672cc moved gtest to modules; added some gtest-based tests 2010-12-28 16:24:23 +00:00
Marius Muja
16b1f61c83 Updated FLANN to version 1.5 2010-10-12 19:47:50 +00:00
Anatoly Baksheev
99f90ffc9e fixed if condition syntax: ! -> NOT 2010-09-24 11:33:06 +00:00
Ethan Rublee
8ee50c422b adding some small changes to support android build,
mainly cmake stuff, but in persistance the wcstombs
is not supported on android, and in
sift.cpp there was and ifdef that affected arm and this
causes undefined symbols on android.
2010-09-22 02:16:33 +00:00
Anatoly Baksheev
d1fc3e6b5a cv::gpu::CudaStream -> cv::gpu::Stream
some refactoring
added gpu module to compilation
2010-08-10 09:44:50 +00:00
Anatoly Baksheev
7f6fb6ef97 First gpu code draft. Interface might be significantly changed in future.
Simple implementation of StereoBM_GPU.
It is excluded from compilation now.
2010-07-14 15:55:16 +00:00
Vadim Pisarevsky
127d6649a1 "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00