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
|
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 |
|