From 061131a5ee5f009a0123022e7549e4d92cc18047 Mon Sep 17 00:00:00 2001 From: Suleyman TURKMEN Date: Wed, 10 Jun 2015 13:18:40 +0300 Subject: [PATCH 1/3] Update imgproc.hpp --- modules/imgproc/include/opencv2/imgproc.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/imgproc/include/opencv2/imgproc.hpp b/modules/imgproc/include/opencv2/imgproc.hpp index 5c18545bce..371fd9466b 100644 --- a/modules/imgproc/include/opencv2/imgproc.hpp +++ b/modules/imgproc/include/opencv2/imgproc.hpp @@ -1785,7 +1785,7 @@ Example: : GaussianBlur( gray, gray, Size(9, 9), 2, 2 ); vector circles; HoughCircles(gray, circles, HOUGH_GRADIENT, - 2, gray->rows/4, 200, 100 ); + 2, gray.rows/4, 200, 100 ); for( size_t i = 0; i < circles.size(); i++ ) { Point center(cvRound(circles[i][0]), cvRound(circles[i][1])); From dac715ad1f641cdd60a4b3a6718de3133f87c1df Mon Sep 17 00:00:00 2001 From: Suleyman TURKMEN Date: Thu, 11 Jun 2015 11:03:14 +0300 Subject: [PATCH 2/3] Update imgproc.hpp --- modules/imgproc/include/opencv2/imgproc.hpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/imgproc/include/opencv2/imgproc.hpp b/modules/imgproc/include/opencv2/imgproc.hpp index 371fd9466b..d0b549b686 100644 --- a/modules/imgproc/include/opencv2/imgproc.hpp +++ b/modules/imgproc/include/opencv2/imgproc.hpp @@ -1689,7 +1689,8 @@ See the line detection example below: #include using namespace cv; - + using namespace std; + int main(int argc, char** argv) { Mat src, dst, color_dst; @@ -1774,11 +1775,12 @@ Example: : #include using namespace cv; - + using namespace std; + int main(int argc, char** argv) { Mat img, gray; - if( argc != 2 && !(img=imread(argv[1], 1)).data) + if( argc != 2 || !(img=imread(argv[1], 1)).data) return -1; cvtColor(img, gray, COLOR_BGR2GRAY); // smooth it, otherwise a lot of false circles may be detected @@ -1797,6 +1799,8 @@ Example: : } namedWindow( "circles", 1 ); imshow( "circles", img ); + + waitKey(0); return 0; } @endcode From caa0058d5b95012a75029714cb2ea14c1d50fd82 Mon Sep 17 00:00:00 2001 From: Suleyman TURKMEN Date: Thu, 11 Jun 2015 11:46:42 +0300 Subject: [PATCH 3/3] Update imgproc.hpp --- modules/imgproc/include/opencv2/imgproc.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/imgproc/include/opencv2/imgproc.hpp b/modules/imgproc/include/opencv2/imgproc.hpp index d0b549b686..a9fa7ae21e 100644 --- a/modules/imgproc/include/opencv2/imgproc.hpp +++ b/modules/imgproc/include/opencv2/imgproc.hpp @@ -1690,7 +1690,7 @@ See the line detection example below: using namespace cv; using namespace std; - + int main(int argc, char** argv) { Mat src, dst, color_dst; @@ -1776,7 +1776,7 @@ Example: : using namespace cv; using namespace std; - + int main(int argc, char** argv) { Mat img, gray; @@ -1799,7 +1799,7 @@ Example: : } namedWindow( "circles", 1 ); imshow( "circles", img ); - + waitKey(0); return 0; }