Commit Graph

84 Commits

Author SHA1 Message Date
Alexander Smorkalov
b75cbfde45 All installed files marked with component names for install customization. 2014-01-21 20:34:36 +04:00
Ilya Lavrenov
5d206059a8 moved bioinspired to opencv_contrib 2014-01-21 18:02:53 +04:00
Roman Donchenko
9c2272d520 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	.gitignore
	CMakeLists.txt
	doc/CMakeLists.txt
	modules/calib3d/src/stereosgbm.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/highgui/src/cap_openni.cpp
	modules/ml/include/opencv2/ml/ml.hpp
	modules/objdetect/src/hog.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/optical_flow_farneback.cpp
	platforms/scripts/camera_build.conf
	platforms/scripts/cmake_android_all_cameras.py
	samples/cpp/Qt_sample/main.cpp
	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
2013-11-26 15:05:26 +04:00
Roman Donchenko
3314bc94b6 Reworked documentation building to work with extra modules.
The main problem with extra modules is that they're located outside
of the OpenCV root, while Sphinx requires that all documents are
within the documentation root. To circumvent this, we create a
"fake root" and copy all documentation (as well as all files that
it depends on) there. It's a bit messy, but what can you do.

As a bonus, this eliminates the need to generate modules/refman.rst
inside the source tree.
2013-11-12 19:38:59 +04:00
Alexander Alekhin
e845184843 Merge remote-tracking branch 'upstream/2.4' into merge-2.4
* #1538 from StevenPuttemans:bugfix_3283
* #1545 from alalek:ocl_test_fix_rng
* #1551 from alalek:cmake_install_win
* #1570 from ilya-lavrenov:ipp_warn_fix
* #1573 from alalek:perf_simple_strategy
* #1574 from alalek:svm_workaround
* #1576 from alalek:ocl_fix_cl_double
* #1577 from ilya-lavrenov:ocl_setto_opencl12
* #1578 from asmorkalov:android_fd_cp_fix
* #1579 from ilya-lavrenov:ocl_norm
* #1582 from sperrholz:ocl-arithm-additions
* #1586 from ilya-lavrenov:ocl_setto_win_fix
* #1589 from ilya-lavrenov:pr1582_fix
* #1591 from alalek:ocl_remove_cl_hpp_h
* #1592 from alalek:ocl_program_cache_update
* #1593 from ilya-lavrenov:ocl_war_on_double
* #1594 from ilya-lavrenov:ocl_perf
* #1595 from alalek:cl_code_cleanup
* #1596 from alalek:test_fix_run_py
* #1597 from alalek:ocl_fix_cleanup
* #1598 from alalek:ocl_fix_build_mac
* #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
* #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse
* #1602 from alalek:ocl_test_dump_info
* #1603 from ilya-lavrenov:ocl_disable_svm_noblas
* #1605 from alalek:ocl_fixes
* #1606 from ilya-lavrenov:ocl_imgproc
* #1607 from ilya-lavrenov:ocl_fft_cleanup
* #1608 from alalek:fix_warn_upd_haar
* #1609 from ilya-lavrenov:ocl_some_optimization
* #1610 from alalek:ocl_fix_perf_kalman
* #1612 from alalek:ocl_fix_string_info
* #1614 from ilya-lavrenov:ocl_svm_misprint
* #1616 from ilya-lavrenov:ocl_cvtColor
* #1617 from ilya-lavrenov:ocl_info
* #1622 from a0byte:2.4
* #1625 from ilya-lavrenov:to_string

Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVDetectPython.cmake
	cmake/OpenCVGenConfig.cmake
	modules/core/CMakeLists.txt
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/perf/main.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/cl_operations.cpp
	modules/ocl/src/cl_programcache.cpp
	modules/ocl/src/color.cpp
	modules/ocl/src/fft.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/gemm.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/pyrlk.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/src/svm.cpp
	modules/ocl/test/main.cpp
	modules/ocl/test/test_fft.cpp
	modules/ocl/test/test_moments.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/test_optflow.cpp
	modules/ocl/test/utility.hpp
	modules/python/CMakeLists.txt
	modules/ts/include/opencv2/ts.hpp
	modules/ts/src/ts_perf.cpp
	samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp
2013-10-15 20:08:52 +04:00
Alexander Alekhin
c0a27ea1a1 cmake: update install rules for doc 2013-10-09 17:49:11 +04:00
Alexander Smorkalov
298a1d50d2 Merge pull request #1299 from jet47:gpu-cuda-rename 2013-09-23 10:31:51 +04:00
antonella
5b2d557502 Added plantuml extension
Aligned strings in CMakeList

Modified the check on plantuml extension

Some fixes

Moved find_host_program for plantuml script
2013-09-12 10:41:21 +00:00
Vladislav Vinogradov
80b9fd87dc removed gpu module from OPENCV2_BASE_MODULES 2013-09-02 14:00: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
Roman Donchenko
d302222d82 Don't put \r into OPENCV_REFMAN_TOC.
There's no need, since configure_file writes its output using native
line endings, anyway.
2013-08-12 19:04:18 +04:00
alexandre benoit
7bff79bbeb updated demos and tutorial regarding the Retina class transfer to bioinspired module. 2013-06-12 22:43:36 +02:00
Alexander Smorkalov
20fef00a77 android -> plarforms/android 2013-05-27 11:10:38 +04:00
Andrey Kamaev
e9301c3c4b Add opencv_cheatsheet.pdf to documentation build and silence Latex output 2013-01-18 18:27:43 +04:00
Alexander Smorkalov
e5468008aa Installation of documents fixed. 2012-12-11 19:08:20 +04:00
Andrey Kamaev
82b30963d2 Restore pdf patch command 2012-09-19 18:45:57 +04:00
Andrey Kamaev
bb51626573 Build pdf for Android Manager documentation 2012-07-13 13:00:29 +00:00
Andrey Kamaev
bf27889f04 Made reference manual table of contents autogenerated 2012-05-30 14:06:47 +00:00
Andrey Kamaev
18dbe6b3e5 cmake scripts are updated to prefer includes from the OpenCV source tree 2012-03-03 15:49:23 +00:00
Vadim Pisarevsky
d8417af086 fixed and improving formatting in opencv2refman.pdf. added support for n-channel mask in Mat::copyTo() and n-channel images in cv::compare(). fixed 2 compile warnings in opencv_python. 2011-07-24 10:34:14 +00:00
Andrey Kamaev
f503b029a7 Allowed to build html documentation without pdf documentation. 2011-07-19 20:27:58 +00:00
Vadim Pisarevsky
5649f35757 some more bugfixed in 2.3 propagated to trunk 2011-07-07 11:43:21 +00:00
Vadim Pisarevsky
d5d0a2f8e0 propagated some more fixes from 2.3 branch to the trunk 2011-06-29 22:26:09 +00:00
Vadim Pisarevsky
f0624c08dc propagated some more changes from 2.3 to trunk 2011-06-23 12:15:35 +00:00
Alexander Shishkov
6ecebb7f66 fixed #768 ticket
renamed OPENCV_SOURCE_DIR to OpenCV_SOURCE_DIR
2011-06-14 10:19:56 +00:00
Alexander Shishkov
ca758a9dac fixed #768 ticket 2011-06-14 10:11:16 +00:00
Vadim Pisarevsky
b699e946b5 converted user guide & tutorials from tex to rst; added them into the whole documentation tree; added html_docs target. 2011-05-10 22:09:07 +00:00
Vadim Pisarevsky
a7b9c31e6a repaired opencv refman & refman1 build 2011-05-09 16:50:29 +00:00
Vadim Pisarevsky
7491596ef8 moved the new docs from docroot to doc 2011-05-09 16:34:47 +00:00
Vadim Pisarevsky
9690cd396b always create <opencv_build_dir>/doc/html to avoid CMake 2.4 error messages 2010-05-26 08:42:33 +00:00
Vadim Pisarevsky
b703faf4cb fixed the module list in Doxygen CMake script 2010-05-22 12:03:15 +00:00
Vadim Pisarevsky
47c3e79423 added Doxygen-based documentation (draft version for now) 2010-05-18 15:41:28 +00:00
Vadim Pisarevsky
127d6649a1 "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00