potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Merge branch 'master' into gpu-cuda-rename

Browse Source
This commit is contained in:
Vladislav Vinogradov
2013-09-11 09:41:23 +04:00
parent 1036ce807c acc2ca484c
commit 6bbac2a7d9
55 changed files with 4254 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/tutorials/imgproc/imgtrans/hough_circle/hough_circle.rst
+1 -1
View File
@@ -40,7 +40,7 @@ Code
* Display the detected circle in a window.
.. |TutorialHoughCirclesSimpleDownload| replace:: here
.. _TutorialHoughCirclesSimpleDownload: http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/houghlines.cpp
.. _TutorialHoughCirclesSimpleDownload: http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/houghcircles.cpp
.. |TutorialHoughCirclesFancyDownload| replace:: here
.. _TutorialHoughCirclesFancyDownload: http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp