mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-10 19:24:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

imgproc: removed LSD code due original code license conflict

Browse Source
This commit is contained in:
Alexander Alekhin 2019-03-01 16:18:49 +03:00
parent a9f67c2d1d
commit 3ba49ccecc
4 changed files with 15 additions and 1055 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/imgproc/include/opencv2/imgproc.hpp
View File

@ -1211,14 +1211,12 @@ protected:
//! @addtogroup imgproc_feature //! @addtogroup imgproc_feature
//! @{ //! @{
/** @example samples/cpp/lsd_lines.cpp
An example using the LineSegmentDetector
\image html building_lsd.png "Sample output image" width=434 height=300
*/
/** @brief Line segment detector class /** @brief Line segment detector class
following the algorithm described at @cite Rafael12 . following the algorithm described at @cite Rafael12 .
@note Implementation has been removed due original code license conflict
*/ */
class CV_EXPORTS_W LineSegmentDetector : public Algorithm class CV_EXPORTS_W LineSegmentDetector : public Algorithm
{ {
@ -1282,6 +1280,8 @@ to edit those, as to tailor it for their own application.
is chosen. is chosen.
@param _density_th Minimal density of aligned region points in the enclosing rectangle. @param _density_th Minimal density of aligned region points in the enclosing rectangle.
@param _n_bins Number of bins in pseudo-ordering of gradient modulus. @param _n_bins Number of bins in pseudo-ordering of gradient modulus.
@note Implementation has been removed due original code license conflict
*/ */
CV_EXPORTS_W Ptr<LineSegmentDetector> createLineSegmentDetector( CV_EXPORTS_W Ptr<LineSegmentDetector> createLineSegmentDetector(
int _refine = LSD_REFINE_STD, double _scale = 0.8, int _refine = LSD_REFINE_STD, double _scale = 0.8,

983
modules/imgproc/src/lsd.cpp
View File

File diff suppressed because it is too large Load Diff

4
modules/imgproc/test/test_lsd.cpp
View File

@ -5,6 +5,8 @@
namespace opencv_test { namespace { namespace opencv_test { namespace {
#if 0 // LSD implementation has been removed due original code license issues
const Size img_size(640, 480); const Size img_size(640, 480);
const int LSD_TEST_SEED = 0x134679; const int LSD_TEST_SEED = 0x134679;
const int EPOCHS = 20; const int EPOCHS = 20;
@ -402,4 +404,6 @@ TEST_F(Imgproc_LSD_Common, compareSegmentsVec4i)
ASSERT_EQ(result2, 11); ASSERT_EQ(result2, 11);
} }
#endif
}} // namespace }} // namespace

73
samples/cpp/lsd_lines.cpp
View File

@ -1,73 +0,0 @@
#include "opencv2/imgproc.hpp"
#include "opencv2/imgcodecs.hpp"
#include "opencv2/highgui.hpp"
#include <iostream>
using namespace std;
using namespace cv;
int main(int argc, char** argv)
{
cv::CommandLineParser parser(argc, argv,
"{input i|building.jpg|input image}"
"{refine r|false|if true use LSD_REFINE_STD method, if false use LSD_REFINE_NONE method}"
"{canny c|false|use Canny edge detector}"
"{overlay o|false|show result on input image}"
"{help h|false|show help message}");
if (parser.get<bool>("help"))
{
parser.printMessage();
return 0;
}
parser.printMessage();
String filename = samples::findFile(parser.get<String>("input"));
bool useRefine = parser.get<bool>("refine");
bool useCanny = parser.get<bool>("canny");
bool overlay = parser.get<bool>("overlay");
Mat image = imread(filename, IMREAD_GRAYSCALE);
if( image.empty() )
{
cout << "Unable to load " << filename;
return 1;
}
imshow("Source Image", image);
if (useCanny)
{
Canny(image, image, 50, 200, 3); // Apply Canny edge detector
}
// Create and LSD detector with standard or no refinement.
Ptr<LineSegmentDetector> ls = useRefine ? createLineSegmentDetector(LSD_REFINE_STD) : createLineSegmentDetector(LSD_REFINE_NONE);
double start = double(getTickCount());
vector<Vec4f> lines_std;
// Detect the lines
ls->detect(image, lines_std);
double duration_ms = (double(getTickCount()) - start) * 1000 / getTickFrequency();
std::cout << "It took " << duration_ms << " ms." << std::endl;
// Show found lines
if (!overlay || useCanny)
{
image = Scalar(0, 0, 0);
}
ls->drawSegments(image, lines_std);
String window_name = useRefine ? "Result - standard refinement" : "Result - no refinement";
window_name += useCanny ? " - Canny edge detector used" : "";
imshow(window_name, image);
waitKey();
return 0;
}