17 Commits

Author	SHA1	Message	Date
yao	3d3e9ab635	Fix the problem of haar caused by merge	2013-07-22 17:53:56 +08:00
peng xiao	143f8f69d6	Add some documentation on ocl::convolve	2013-04-08 17:15:52 +08:00
Andrey Kamaev	1ca8f33b4e	Merge branch '2.4'	2013-03-21 23:11:54 +04:00
Andrey Kamaev	4bd721ad3b	Fix build errors	2013-03-21 18:37:34 +04:00
Andrey Kamaev	891d7da6ee	Merge branch '2.4'	2013-02-28 11:17:06 +04:00
hgaspar	60981565fa	updated the ocl module introduction	2013-02-24 22:34:44 -05:00
Andrey Kamaev	b44b920997	Merge branch '2.4'	2013-02-12 16:30:18 +04:00
yao	568b935246	remove a warning on Linux ... fix a error in doc	2013-02-05 17:16:40 +08:00
Andrey Kamaev	f3f55b30b0	Merge pull request #267 from pclove1:ocl_hough	2013-01-19 12:02:14 +04:00
Suenghoon Park	06da75ffe0	Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough	2013-01-15 12:21:25 -05:00
Alexander Smorkalov	8cb0343f4c	Documentation build warning fixes. ... Invalid links and refences fixed. SpaeseMat class documentation updated.	2013-01-14 17:58:27 +04:00
Suenghoon Park	8a1d6a1bb2	added documentation for ocl::HoughCircles	2012-12-26 17:40:26 -05:00
Andrey Kamaev	b401c6a0c3	Fix discrepancies between function signatures in headers and documentation	2012-12-26 18:24:50 +04:00
Vadim Pisarevsky	849a8c8d20	fixed many errors in warnings in rst docs; added ocl module description (by Niko Li)	2012-10-31 15:15:51 +04:00
Andrey Kamaev	461b69f6ee	Eliminate discrepancies between signatures in documentation and OpenCV headers ... All errors were found by doc/check_docs2.py	2012-10-17 21:24:55 +04:00
Andrey Kamaev	8aa2d6cddc	Fix several documentation build warnings	2012-08-07 18:00:09 +04:00
Vadim Pisarevsky	9f4efab40a	merged ocl module from ocl branch (it's not quite usable yet; at least on Mac)	2012-07-16 17:08:14 +00:00