diff --git a/samples/cpp/create_mask.cpp b/samples/cpp/create_mask.cpp index dc54953678..67b0ec9bbd 100644 --- a/samples/cpp/create_mask.cpp +++ b/samples/cpp/create_mask.cpp @@ -74,9 +74,7 @@ void mouseHandler(int event, int x, int y, int, void*) final = Mat::zeros(src.size(), CV_8UC3); mask = Mat::zeros(src.size(), CV_8UC1); - vector > vpts; - vpts.push_back(pts); - fillPoly(mask, vpts, Scalar(255, 255, 255), 8, 0); + fillPoly(mask, pts, Scalar(255, 255, 255), 8, 0); bitwise_and(src, src, final, mask); imshow("Mask", mask); imshow("Result", final); diff --git a/samples/cpp/intersectExample.cpp b/samples/cpp/intersectExample.cpp index a8a897241f..187aebbea9 100644 --- a/samples/cpp/intersectExample.cpp +++ b/samples/cpp/intersectExample.cpp @@ -50,9 +50,7 @@ static float drawIntersection(Mat &image, vector polygon1, vector { fillColor = Scalar(0, 0, 255); } - vector > pp; - pp.push_back(intersectionPolygon); - fillPoly(image, pp, fillColor); + fillPoly(image, intersectionPolygon, fillColor); } polylines(image, polygons, true, Scalar(0, 0, 0)); diff --git a/samples/cpp/squares.cpp b/samples/cpp/squares.cpp index 36535d1ee0..042a716f90 100644 --- a/samples/cpp/squares.cpp +++ b/samples/cpp/squares.cpp @@ -121,21 +121,6 @@ static void findSquares( const Mat& image, vector >& squares ) } } - -// the function draws all the squares in the image -static void drawSquares( Mat& image, const vector >& squares ) -{ - for( size_t i = 0; i < squares.size(); i++ ) - { - const Point* p = &squares[i][0]; - int n = (int)squares[i].size(); - polylines(image, &p, &n, 1, true, Scalar(0,255,0), 3, LINE_AA); - } - - imshow(wndname, image); -} - - int main(int argc, char** argv) { static const char* names[] = { "pic1.png", "pic2.png", "pic3.png", @@ -148,8 +133,6 @@ int main(int argc, char** argv) names[1] = "0"; } - vector > squares; - for( int i = 0; names[i] != 0; i++ ) { string filename = samples::findFile(names[i]); @@ -160,8 +143,11 @@ int main(int argc, char** argv) continue; } + vector > squares; findSquares(image, squares); - drawSquares(image, squares); + + polylines(image, squares, true, Scalar(0, 255, 0), 3, LINE_AA); + imshow(wndname, image); int c = waitKey(); if( c == 27 )