Merge pull request #2741 from alalek:imgproc_drop_lsd

Author: alalek

modules/line_descriptor/src/LSDDetector.cpp

@@ -119,6 +119,10 @@ void LSDDetector::detect( const Mat& image, CV_OUT std::vector<KeyLine>& keyline
 void LSDDetector::detect( const std::vector<Mat>& images, std::vector<std::vector<KeyLine> >& keylines, int scale, int numOctaves,
                           const std::vector<Mat>& masks ) const
 {
+#if 1
+    CV_UNUSED(images); CV_UNUSED(keylines); CV_UNUSED(scale); CV_UNUSED(numOctaves); CV_UNUSED(masks);
+    CV_Error(Error::StsNotImplemented, "Implementation has been disabled due to createLineSegmentDetector() removal");
+#else
   /* detect lines from each image */
   for ( size_t counter = 0; counter < images.size(); counter++ )
   {
@@ -128,11 +132,16 @@ void LSDDetector::detect( const std::vector<Mat>& images, std::vector<std::vecto
     else
       detectImpl( images[counter], keylines[counter], numOctaves, scale, masks[counter] );
   }
+#endif
 }
 
 /* implementation of line detection */
 void LSDDetector::detectImpl( const Mat& imageSrc, std::vector<KeyLine>& keylines, int numOctaves, int scale, const Mat& mask ) const
 {
+#if 1
+    CV_UNUSED(imageSrc); CV_UNUSED(keylines); CV_UNUSED(numOctaves); CV_UNUSED(scale); CV_UNUSED(mask);
+    CV_Error(Error::StsNotImplemented, "Implementation has been disabled due to createLineSegmentDetector() removal");
+#else
   cv::Mat image;
   if( imageSrc.channels() != 1 )
     cvtColor( imageSrc, image, COLOR_BGR2GRAY );
@@ -218,7 +227,7 @@ void LSDDetector::detectImpl( const Mat& imageSrc, std::vector<KeyLine>& keyline
       }
     }
   }
-
+#endif
 }
 }
 }