Skip to content

O
opencv
Commit 20fe614c authored by Alexander Mordvintsev's avatar Alexander Mordvintsev Committed by Vadim Pisarevsky
Browse files
Options

createLineSegmentDetectorPtr -> createLineSegmentDetector in tests and samples

parent 0a8d62e5
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
modules/imgproc/test/test_lsd.cpp
View file @ 20fe614c
...@@ -110,7 +110,7 @@ TEST_F(Imgproc_LSD_ADV, whiteNoise) ...@@ -110,7 +110,7 @@ TEST_F(Imgproc_LSD_ADV, whiteNoise)
for (int i = 0; i < EPOCHS; ++i) for (int i = 0; i < EPOCHS; ++i)
{ {
GenerateWhiteNoise(test_image); GenerateWhiteNoise(test_image);
Ptr<LineSegmentDetector> detector = createLineSegmentDetectorPtr(LSD_REFINE_ADV); Ptr<LineSegmentDetector> detector = createLineSegmentDetector(LSD_REFINE_ADV);
detector->detect(test_image, lines); detector->detect(test_image, lines);
if(40u >= lines.size()) ++passedtests; if(40u >= lines.size()) ++passedtests;
...@@ -123,7 +123,7 @@ TEST_F(Imgproc_LSD_ADV, constColor) ...@@ -123,7 +123,7 @@ TEST_F(Imgproc_LSD_ADV, constColor)
for (int i = 0; i < EPOCHS; ++i) for (int i = 0; i < EPOCHS; ++i)
{ {
GenerateConstColor(test_image); GenerateConstColor(test_image);
Ptr<LineSegmentDetector> detector = createLineSegmentDetectorPtr(LSD_REFINE_ADV); Ptr<LineSegmentDetector> detector = createLineSegmentDetector(LSD_REFINE_ADV);
detector->detect(test_image, lines); detector->detect(test_image, lines);
if(0u == lines.size()) ++passedtests; if(0u == lines.size()) ++passedtests;
...@@ -137,7 +137,7 @@ TEST_F(Imgproc_LSD_ADV, lines) ...@@ -137,7 +137,7 @@ TEST_F(Imgproc_LSD_ADV, lines)
{ {
const unsigned int numOfLines = 1; const unsigned int numOfLines = 1;
GenerateLines(test_image, numOfLines); GenerateLines(test_image, numOfLines);
Ptr<LineSegmentDetector> detector = createLineSegmentDetectorPtr(LSD_REFINE_ADV); Ptr<LineSegmentDetector> detector = createLineSegmentDetector(LSD_REFINE_ADV);
detector->detect(test_image, lines); detector->detect(test_image, lines);
if(numOfLines * 2 == lines.size()) ++passedtests; // * 2 because of Gibbs effect if(numOfLines * 2 == lines.size()) ++passedtests; // * 2 because of Gibbs effect
...@@ -150,7 +150,7 @@ TEST_F(Imgproc_LSD_ADV, rotatedRect) ...@@ -150,7 +150,7 @@ TEST_F(Imgproc_LSD_ADV, rotatedRect)
for (int i = 0; i < EPOCHS; ++i) for (int i = 0; i < EPOCHS; ++i)
{ {
GenerateRotatedRect(test_image); GenerateRotatedRect(test_image);
Ptr<LineSegmentDetector> detector = createLineSegmentDetectorPtr(LSD_REFINE_ADV); Ptr<LineSegmentDetector> detector = createLineSegmentDetector(LSD_REFINE_ADV);
detector->detect(test_image, lines); detector->detect(test_image, lines);
if(2u <= lines.size()) ++passedtests; if(2u <= lines.size()) ++passedtests;
...@@ -163,7 +163,7 @@ TEST_F(Imgproc_LSD_STD, whiteNoise) ...@@ -163,7 +163,7 @@ TEST_F(Imgproc_LSD_STD, whiteNoise)
for (int i = 0; i < EPOCHS; ++i) for (int i = 0; i < EPOCHS; ++i)
{ {
GenerateWhiteNoise(test_image); GenerateWhiteNoise(test_image);
Ptr<LineSegmentDetector> detector = createLineSegmentDetectorPtr(LSD_REFINE_STD); Ptr<LineSegmentDetector> detector = createLineSegmentDetector(LSD_REFINE_STD);
detector->detect(test_image, lines); detector->detect(test_image, lines);
if(50u >= lines.size()) ++passedtests; if(50u >= lines.size()) ++passedtests;
...@@ -176,7 +176,7 @@ TEST_F(Imgproc_LSD_STD, constColor) ...@@ -176,7 +176,7 @@ TEST_F(Imgproc_LSD_STD, constColor)
for (int i = 0; i < EPOCHS; ++i) for (int i = 0; i < EPOCHS; ++i)
{ {
GenerateConstColor(test_image); GenerateConstColor(test_image);
Ptr<LineSegmentDetector> detector = createLineSegmentDetectorPtr(LSD_REFINE_STD); Ptr<LineSegmentDetector> detector = createLineSegmentDetector(LSD_REFINE_STD);
detector->detect(test_image, lines); detector->detect(test_image, lines);
if(0u == lines.size()) ++passedtests; if(0u == lines.size()) ++passedtests;
...@@ -190,7 +190,7 @@ TEST_F(Imgproc_LSD_STD, lines) ...@@ -190,7 +190,7 @@ TEST_F(Imgproc_LSD_STD, lines)
{ {
const unsigned int numOfLines = 1; const unsigned int numOfLines = 1;
GenerateLines(test_image, numOfLines); GenerateLines(test_image, numOfLines);
Ptr<LineSegmentDetector> detector = createLineSegmentDetectorPtr(LSD_REFINE_STD); Ptr<LineSegmentDetector> detector = createLineSegmentDetector(LSD_REFINE_STD);
detector->detect(test_image, lines); detector->detect(test_image, lines);
if(numOfLines * 2 == lines.size()) ++passedtests; // * 2 because of Gibbs effect if(numOfLines * 2 == lines.size()) ++passedtests; // * 2 because of Gibbs effect
...@@ -203,7 +203,7 @@ TEST_F(Imgproc_LSD_STD, rotatedRect) ...@@ -203,7 +203,7 @@ TEST_F(Imgproc_LSD_STD, rotatedRect)
for (int i = 0; i < EPOCHS; ++i) for (int i = 0; i < EPOCHS; ++i)
{ {
GenerateRotatedRect(test_image); GenerateRotatedRect(test_image);
Ptr<LineSegmentDetector> detector = createLineSegmentDetectorPtr(LSD_REFINE_STD); Ptr<LineSegmentDetector> detector = createLineSegmentDetector(LSD_REFINE_STD);
detector->detect(test_image, lines); detector->detect(test_image, lines);
if(4u <= lines.size()) ++passedtests; if(4u <= lines.size()) ++passedtests;
...@@ -216,7 +216,7 @@ TEST_F(Imgproc_LSD_NONE, whiteNoise) ...@@ -216,7 +216,7 @@ TEST_F(Imgproc_LSD_NONE, whiteNoise)
for (int i = 0; i < EPOCHS; ++i) for (int i = 0; i < EPOCHS; ++i)
{ {
GenerateWhiteNoise(test_image); GenerateWhiteNoise(test_image);
Ptr<LineSegmentDetector> detector = createLineSegmentDetectorPtr(LSD_REFINE_STD); Ptr<LineSegmentDetector> detector = createLineSegmentDetector(LSD_REFINE_STD);
detector->detect(test_image, lines); detector->detect(test_image, lines);
if(50u >= lines.size()) ++passedtests; if(50u >= lines.size()) ++passedtests;
...@@ -229,7 +229,7 @@ TEST_F(Imgproc_LSD_NONE, constColor) ...@@ -229,7 +229,7 @@ TEST_F(Imgproc_LSD_NONE, constColor)
for (int i = 0; i < EPOCHS; ++i) for (int i = 0; i < EPOCHS; ++i)
{ {
GenerateConstColor(test_image); GenerateConstColor(test_image);
Ptr<LineSegmentDetector> detector = createLineSegmentDetectorPtr(LSD_REFINE_NONE); Ptr<LineSegmentDetector> detector = createLineSegmentDetector(LSD_REFINE_NONE);
detector->detect(test_image, lines); detector->detect(test_image, lines);
if(0u == lines.size()) ++passedtests; if(0u == lines.size()) ++passedtests;
...@@ -243,7 +243,7 @@ TEST_F(Imgproc_LSD_NONE, lines) ...@@ -243,7 +243,7 @@ TEST_F(Imgproc_LSD_NONE, lines)
{ {
const unsigned int numOfLines = 1; const unsigned int numOfLines = 1;
GenerateLines(test_image, numOfLines); GenerateLines(test_image, numOfLines);
Ptr<LineSegmentDetector> detector = createLineSegmentDetectorPtr(LSD_REFINE_NONE); Ptr<LineSegmentDetector> detector = createLineSegmentDetector(LSD_REFINE_NONE);
detector->detect(test_image, lines); detector->detect(test_image, lines);
if(numOfLines * 2 == lines.size()) ++passedtests; // * 2 because of Gibbs effect if(numOfLines * 2 == lines.size()) ++passedtests; // * 2 because of Gibbs effect
...@@ -256,7 +256,7 @@ TEST_F(Imgproc_LSD_NONE, rotatedRect) ...@@ -256,7 +256,7 @@ TEST_F(Imgproc_LSD_NONE, rotatedRect)
for (int i = 0; i < EPOCHS; ++i) for (int i = 0; i < EPOCHS; ++i)
{ {
GenerateRotatedRect(test_image); GenerateRotatedRect(test_image);
Ptr<LineSegmentDetector> detector = createLineSegmentDetectorPtr(LSD_REFINE_NONE); Ptr<LineSegmentDetector> detector = createLineSegmentDetector(LSD_REFINE_NONE);
detector->detect(test_image, lines); detector->detect(test_image, lines);
if(8u <= lines.size()) ++passedtests; if(8u <= lines.size()) ++passedtests;
......
samples/cpp/lsd_lines.cpp
View file @ 20fe614c
...@@ -30,9 +30,9 @@ int main(int argc, char** argv) ...@@ -30,9 +30,9 @@ int main(int argc, char** argv)
// Create and LSD detector with standard or no refinement. // Create and LSD detector with standard or no refinement.
#if 1 #if 1
Ptr<LineSegmentDetector> ls = createLineSegmentDetectorPtr(LSD_REFINE_STD); Ptr<LineSegmentDetector> ls = createLineSegmentDetector(LSD_REFINE_STD);
#else #else
Ptr<LineSegmentDetector> ls = createLineSegmentDetectorPtr(LSD_REFINE_NONE); Ptr<LineSegmentDetector> ls = createLineSegmentDetector(LSD_REFINE_NONE);
#endif #endif
double start = double(getTickCount()); double start = double(getTickCount());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment