generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
14,121 Commits 3 Branches 47 Tags
dfe5fff2f5bd6d68eb1a912832ed1cb9004e28da
Commit Graph

44 Commits

Author SHA1 Message Date
Joan Puigcerver
16a82b1747 Added an option to traincascade program to select the maximum number of threads to use during training 2014-07-23 22:47:51 +02:00
Roman Donchenko
3c4b24d531 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	modules/highgui/src/cap.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/imgproc.cpp
	samples/ocl/facedetect.cpp
 2013-12-23 18:50:17 +04:00
Roman Donchenko
6e22be4100 Merge pull request #2003 from vbystricky:intelperc_camera_2.4 2013-12-20 17:06:27 +04:00
Vladimir Bystricky
63ae0eeba5 Fix build errors 2013-12-17 18:39:52 +04:00
Vladimir Bystricky
cc08e00876 Fix notes about cmake files. Fix build warning. 2013-12-17 16:13:55 +04:00
Vladimir Bystricky
4088013251 Add set/get depth generator properties by default. Add documentation 2013-12-17 12:00:40 +04:00
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
Roman Donchenko
f55740da70 Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
Andrey Kamaev
f4e27bcbbc Merge branch '2.4' 2013-01-25 16:30:36 +04:00
Andy Maloney
5d65d000ab Docs: Fix invalid conversion format in example (CV_BGR2GREY -> CV_BGR2GRAY) 2013-01-24 10:08:58 -05:00
Andrey Kamaev
962884cdec Merge branch 2.4 2012-12-21 17:58:48 +04:00
Vsevolod Glumov
3f417f1ec3 Fixes for issues #2570, #2492, #2559, #2489, #2592. 2012-12-14 10:49:51 +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
0e7ca71dcc Normalize whitespace in documentation and text files 2012-10-17 21:42:09 +04: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
Vadim Pisarevsky
d5a0088bbe merged 2.4 into trunk 2012-04-30 14:33:52 +00:00
Vadim Pisarevsky
488ae9dd6e corrected typo (ticket #1843). added note about imdecode & imencode 2012-04-24 12:54:49 +00:00
Vadim Pisarevsky
2fd1e2ea57 merged all the latest changes from 2.4 to trunk 2012-04-13 21:50:59 +00:00
Vadim Pisarevsky
c0000f3aed added missing contrib & legacy chapters to the reference manual; fixed (x, y)->(y, x) ordering in Mat.at (ticket #1726) 2012-04-10 14:28:48 +00: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
Andrey Kamaev
aeaae8b057 Updated rst configuration to read OpenCV version from sources; fixed several sphinx' warnings 2012-03-02 20:59:13 +00:00
Maria Dimashova
fbcd2a4e0a added example of vec-file 2011-12-23 07:48:36 +00:00
Kirill Kornyakov
61515f78c3 user guide on cascade training a bit updated 2011-11-10 12:03:44 +00:00
Maria Dimashova
eeaf6192e3 minor change of doc 2011-10-11 14:42:49 +00:00
Maria Dimashova
ddc7142ab3 minor change of doc 2011-10-11 10:01:39 +00:00
Maria Dimashova
9e60334f7b added doc on cascade classifier training 2011-10-10 12:50:49 +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
Bernat Gabor
762bc0f8af Some reST syntax correction. Now the PDF documentation builds correctly under Windows using MIKTEX. Some update on the tutorial structure. Some CSS syntax correction. Windows Install Tutorial v0.4. 2011-06-30 00:41:41 +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
Maria Dimashova
ad896ae640 refactored OpenNI integration 2011-02-04 13:41:10 +00:00
Maria Dimashova
566d19d7a7 minor changes of user guide (Kinect section) 2011-02-01 10:04:14 +00:00
Victor Erukhimov
55a8d03888 English corrected 2011-01-31 19:53:56 +00:00
Maria Dimashova
85e5de67e4 added help on Kinect usage to user guide 2011-01-27 10:53:13 +00:00
Victor Erukhimov
afd42eed4b Added features2d section 2011-01-18 15:56:40 +00:00
Victor Erukhimov
12201ff673 Moving all user guide sources to a single folder 2011-01-17 13:15:40 +00:00