Roman Donchenko
|
d58cd9851f
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
CMakeLists.txt
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
modules/core/src/cmdparser.cpp
modules/gpu/CMakeLists.txt
modules/gpu/doc/introduction.rst
modules/gpu/perf/perf_video.cpp
modules/highgui/doc/reading_and_writing_images_and_video.rst
modules/ocl/src/cl_context.cpp
modules/video/include/opencv2/video/background_segm.hpp
samples/cpp/image_sequence.cpp
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
samples/python/chessboard.py
samples/python/cvutils.py
samples/python/demhist.py
samples/python/dft.py
samples/python/distrans.py
samples/python/edge.py
samples/python/ffilldemo.py
samples/python/fitellipse.py
samples/python/houghlines.py
samples/python/inpaint.py
samples/python/logpolar.py
samples/python/morphology.py
samples/python/numpy_array.py
samples/python/watershed.py
|
2013-12-03 17:35:21 +04:00 |
|
StevenPuttemans
|
6f892b10ff
|
Applied feature #3375 and fix of pull 1842 to avoid merging problems later
|
2013-11-25 10:53:03 +01:00 |
|
Roman Donchenko
|
2c4bbb313c
|
Merge commit '43aec5ad' into merge-2.4
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
|
2013-08-27 13:26:44 +04:00 |
|
Roman Donchenko
|
e9a28f66ee
|
Normalized file endings.
|
2013-08-21 18:59:25 +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 |
|
Vsevolod Glumov
|
3f417f1ec3
|
Fixes for issues #2570, #2492, #2559, #2489, #2592.
|
2012-12-14 10:49:51 +04:00 |
|
Andrey Kamaev
|
639bbec44a
|
svn repository web references are replaced with links to git
|
2012-08-24 15:59:43 +04:00 |
|
Alexander Shishkov
|
be63ce723f
|
#1672
updated links in cheatsheet
renamed directory for Mat tutorial
changed links from willow docs to opencv.itseez.com, from Trac to current Redmine
|
2012-03-11 14:35:46 +00:00 |
|
Bernat Gabor
|
43e083f145
|
Ok, now optimized the tutorial size for real. Made JPG/PNG optimization for all the images. Modified some tutorial files to follow these size optimizations. Now the tutorial PDF generated is 3.95MB, so enjoy!
|
2011-07-20 18:08:25 +00:00 |
|
Ana Huaman
|
4e42bf6308
|
Added reST tutorials for Contours (6 in imgproc) and for Corner Detection (4 in features2D) + links in conf.py
|
2011-07-13 17:53:45 +00:00 |
|