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
|
8ff267cbac
|
Fixed incorrectly unprefixed constant names in the OpenNI tutorial.
Bug report: http://code.opencv.org/issues/3329
|
2013-10-22 14:48:25 +04:00 |
|
Stephen Fox
|
9f8ce906f4
|
fix to documentation regarding CV_CAP_OPENNI_* in high gui userguide
fix comments to accurate match CV_CAP_OPENNI_* vs. wrong OPENNI_*
|
2012-10-22 23:18:46 -05:00 |
|
Andrey Kamaev
|
639bbec44a
|
svn repository web references are replaced with links to git
|
2012-08-24 15:59:43 +04:00 |
|
Andrey Kamaev
|
5100ca7508
|
svn repository web references are replaced with links to git
|
2012-08-07 14:30:36 +04:00 |
|
Maria Dimashova
|
550fd8e57c
|
added image and depth synchronization
|
2012-03-27 07:41:48 +00:00 |
|
Maria Dimashova
|
baa81de122
|
renamed property of openni camera
|
2012-03-16 13:59:08 +00:00 |
|
Maria Dimashova
|
00aca7e77a
|
renamed property of openni camera
|
2012-03-16 09:08:18 +00:00 |
|
Maria Dimashova
|
930c7bf20e
|
minor refactoring CvCapture_OpenNI
|
2012-03-15 15:55:07 +00:00 |
|
Alexander Shishkov
|
698fb8c1df
|
modified documentation about using OpenNI wrapper #1657
|
2012-03-13 12:00:25 +00:00 |
|
Maria Dimashova
|
04e4eaabaf
|
updated openni finding by cmake (#1190, #1252); updated doc on kinect
|
2011-08-10 14:58:55 +00:00 |
|
Maria Dimashova
|
1d7877eeaf
|
added doc on supported Kinect properties (#1251)
|
2011-08-09 14:00:11 +00:00 |
|
Maria Dimashova
|
411e7798aa
|
added the link in doc on kinect
|
2011-05-18 11:57:43 +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 |
|