From e39065bf77d39c15bdbec332ede15871420b57c3 Mon Sep 17 00:00:00 2001 From: biagio montesano Date: Wed, 20 Aug 2014 19:16:12 +0200 Subject: [PATCH] Created nested namespace. Modified interface classes. --- .../include/opencv2/line_descriptor/descriptor.hpp | 13 ++++++++----- modules/line_descriptor/perf/perf_descriptors.cpp | 1 + modules/line_descriptor/perf/perf_detection.cpp | 1 + modules/line_descriptor/perf/perf_matching.cpp | 1 + .../line_descriptor/samples/compute_descriptors.cpp | 4 ++++ modules/line_descriptor/samples/knn_matching.cpp | 5 ++--- .../line_descriptor/samples/lines_extraction.cpp | 1 + .../samples/lsd_lines_extraction.cpp | 1 + modules/line_descriptor/samples/matching.cpp | 5 ++++- modules/line_descriptor/samples/radius_matching.cpp | 1 + modules/line_descriptor/src/LSDDetector.cpp | 11 ++++++++--- modules/line_descriptor/src/binary_descriptor.cpp | 3 +++ .../src/binary_descriptor_matcher.cpp | 8 +++++++- modules/line_descriptor/src/draw.cpp | 3 +++ .../line_descriptor/src/line_descriptor_init.cpp | 3 +++ modules/line_descriptor/src/precomp.hpp | 1 + .../test/test_descriptors_regression.cpp | 1 + .../test/test_detector_regression.cpp | 1 + .../test/test_matcher_regression.cpp | 1 + 19 files changed, 52 insertions(+), 13 deletions(-) diff --git a/modules/line_descriptor/include/opencv2/line_descriptor/descriptor.hpp b/modules/line_descriptor/include/opencv2/line_descriptor/descriptor.hpp index 1d973d664..75a57b5e3 100644 --- a/modules/line_descriptor/include/opencv2/line_descriptor/descriptor.hpp +++ b/modules/line_descriptor/include/opencv2/line_descriptor/descriptor.hpp @@ -55,8 +55,10 @@ namespace cv { +namespace line_descriptor +{ -CV_EXPORTS bool initModule_line_descriptor(); +//CV_EXPORTS bool initModule_line_descriptor(); struct CV_EXPORTS KeyLine { @@ -421,14 +423,15 @@ struct CV_EXPORTS DrawLinesMatchesFlags /* draw matches between two images */ CV_EXPORTS void drawLineMatches( const Mat& img1, const std::vector& keylines1, const Mat& img2, const std::vector& keylines2, - const std::vector& matches1to2, Mat& outImg, const Scalar& matchColor = Scalar::all( -1 ), - const Scalar& singleLineColor = Scalar::all( -1 ), const std::vector& matchesMask = std::vector(), - int flags = DrawLinesMatchesFlags::DEFAULT ); + const std::vector& matches1to2, Mat& outImg, const Scalar& matchColor = Scalar::all( -1 ), + const Scalar& singleLineColor = Scalar::all( -1 ), const std::vector& matchesMask = std::vector(), + int flags = DrawLinesMatchesFlags::DEFAULT ); /* draw extracted lines on original image */ CV_EXPORTS void drawKeylines( const Mat& image, const std::vector& keylines, Mat& outImage, const Scalar& color = Scalar::all( -1 ), - int flags = DrawLinesMatchesFlags::DEFAULT ); + int flags = DrawLinesMatchesFlags::DEFAULT ); } +} #endif diff --git a/modules/line_descriptor/perf/perf_descriptors.cpp b/modules/line_descriptor/perf/perf_descriptors.cpp index 95a5b1516..9bfa6e6ef 100644 --- a/modules/line_descriptor/perf/perf_descriptors.cpp +++ b/modules/line_descriptor/perf/perf_descriptors.cpp @@ -42,6 +42,7 @@ #include "perf_precomp.hpp" using namespace cv; +using namespace cv::line_descriptor; using namespace std; using namespace perf; using std::tr1::make_tuple; diff --git a/modules/line_descriptor/perf/perf_detection.cpp b/modules/line_descriptor/perf/perf_detection.cpp index c89bf17a9..5b6b24800 100644 --- a/modules/line_descriptor/perf/perf_detection.cpp +++ b/modules/line_descriptor/perf/perf_detection.cpp @@ -42,6 +42,7 @@ #include "perf_precomp.hpp" using namespace cv; +using namespace cv::line_descriptor; using namespace std; using namespace perf; using std::tr1::make_tuple; diff --git a/modules/line_descriptor/perf/perf_matching.cpp b/modules/line_descriptor/perf/perf_matching.cpp index d5bfdb82d..11b951072 100644 --- a/modules/line_descriptor/perf/perf_matching.cpp +++ b/modules/line_descriptor/perf/perf_matching.cpp @@ -42,6 +42,7 @@ #include "perf_precomp.hpp" using namespace cv; +using namespace cv::line_descriptor; using namespace std; using namespace perf; using std::tr1::make_tuple; diff --git a/modules/line_descriptor/samples/compute_descriptors.cpp b/modules/line_descriptor/samples/compute_descriptors.cpp index 326dace13..07097fc6d 100644 --- a/modules/line_descriptor/samples/compute_descriptors.cpp +++ b/modules/line_descriptor/samples/compute_descriptors.cpp @@ -50,6 +50,8 @@ #include using namespace cv; +using namespace cv::line_descriptor; + static const char* keys = { "{@image_path | | Image path }" }; @@ -96,3 +98,5 @@ int main( int argc, char** argv ) bd->compute( imageMat, keylines, descriptors); } + + diff --git a/modules/line_descriptor/samples/knn_matching.cpp b/modules/line_descriptor/samples/knn_matching.cpp index 088697129..664eb3a1e 100644 --- a/modules/line_descriptor/samples/knn_matching.cpp +++ b/modules/line_descriptor/samples/knn_matching.cpp @@ -52,6 +52,7 @@ #include using namespace cv; +using namespace cv::line_descriptor; static const char* keys = { "{@image_path1 | | Image path 1 }" @@ -192,8 +193,6 @@ int main( int argc, char** argv ) /* require knn match */ bdm->knnMatch( descr1, descr2, matches, 6 ); - - - } + diff --git a/modules/line_descriptor/samples/lines_extraction.cpp b/modules/line_descriptor/samples/lines_extraction.cpp index a5edac1b6..95b5990f9 100644 --- a/modules/line_descriptor/samples/lines_extraction.cpp +++ b/modules/line_descriptor/samples/lines_extraction.cpp @@ -50,6 +50,7 @@ #include using namespace cv; +using namespace cv::line_descriptor; using namespace std; static const char* keys = diff --git a/modules/line_descriptor/samples/lsd_lines_extraction.cpp b/modules/line_descriptor/samples/lsd_lines_extraction.cpp index 60b25bb18..da659a52e 100644 --- a/modules/line_descriptor/samples/lsd_lines_extraction.cpp +++ b/modules/line_descriptor/samples/lsd_lines_extraction.cpp @@ -50,6 +50,7 @@ #include using namespace cv; +using namespace cv::line_descriptor; using namespace std; static const char* keys = diff --git a/modules/line_descriptor/samples/matching.cpp b/modules/line_descriptor/samples/matching.cpp index 4d1c3a75e..d02530f24 100644 --- a/modules/line_descriptor/samples/matching.cpp +++ b/modules/line_descriptor/samples/matching.cpp @@ -52,6 +52,7 @@ #define MATCHES_DIST_THRESHOLD 25 using namespace cv; +using namespace cv::line_descriptor; static const char* keys = { "{@image_path1 | | Image path 1 }" @@ -146,7 +147,7 @@ int main( int argc, char** argv ) imshow( "Matches", outImg ); waitKey(); - imwrite("/home/ubisum/Desktop/images/matches.jpg", outImg); + imwrite("/home/ubisum/Desktop/images/env_match/matches.jpg", outImg); /* create an LSD detector */ Ptr lsd = LSDDetector::createLSDDetector(); @@ -203,5 +204,7 @@ int main( int argc, char** argv ) imshow( "LSD matches", lsd_outImg ); waitKey(); + + } diff --git a/modules/line_descriptor/samples/radius_matching.cpp b/modules/line_descriptor/samples/radius_matching.cpp index cd8c9da53..91da9f5ec 100644 --- a/modules/line_descriptor/samples/radius_matching.cpp +++ b/modules/line_descriptor/samples/radius_matching.cpp @@ -51,6 +51,7 @@ #include using namespace cv; +using namespace cv::line_descriptor; static const std::string images[] = { "cameraman.jpg", "church.jpg", "church2.png", "einstein.jpg", "stuff.jpg" }; diff --git a/modules/line_descriptor/src/LSDDetector.cpp b/modules/line_descriptor/src/LSDDetector.cpp index 3cf760a58..eff184d0f 100644 --- a/modules/line_descriptor/src/LSDDetector.cpp +++ b/modules/line_descriptor/src/LSDDetector.cpp @@ -41,8 +41,11 @@ #include "precomp.hpp" -using namespace cv; - +//using namespace cv; +namespace cv +{ +namespace line_descriptor +{ Ptr LSDDetector::createLSDDetector() { return Ptr( new LSDDetector() ); @@ -199,10 +202,12 @@ void LSDDetector::detectImpl( const Mat& imageSrc, std::vector& keyline for ( size_t keyCounter = 0; keyCounter < keylines.size(); keyCounter++ ) { KeyLine kl = keylines[keyCounter]; - if( mask.at( (int)kl.startPointY, (int)kl.startPointX ) == 0 && mask.at( (int)kl.endPointY, (int)kl.endPointX ) == 0 ) + if( mask.at( (int) kl.startPointY, (int) kl.startPointX ) == 0 && mask.at( (int) kl.endPointY, (int) kl.endPointX ) == 0 ) keylines.erase( keylines.begin() + keyCounter ); } } } +} +} diff --git a/modules/line_descriptor/src/binary_descriptor.cpp b/modules/line_descriptor/src/binary_descriptor.cpp index 3f04f1d54..a133a6eee 100644 --- a/modules/line_descriptor/src/binary_descriptor.cpp +++ b/modules/line_descriptor/src/binary_descriptor.cpp @@ -46,6 +46,8 @@ //using namespace cv; namespace cv { +namespace line_descriptor +{ /* combinations of internal indeces for binary descriptor extractor */ static const int combinations[32][2] = @@ -1345,3 +1347,4 @@ int BinaryDescriptor::computeLBD( ScaleLines &keyLines, bool useDetectionData ) } } +} diff --git a/modules/line_descriptor/src/binary_descriptor_matcher.cpp b/modules/line_descriptor/src/binary_descriptor_matcher.cpp index b7a1665b8..7f044a4f4 100644 --- a/modules/line_descriptor/src/binary_descriptor_matcher.cpp +++ b/modules/line_descriptor/src/binary_descriptor_matcher.cpp @@ -41,7 +41,11 @@ #include "precomp.hpp" -using namespace cv; +//using namespace cv; +namespace cv +{ +namespace line_descriptor +{ /* constructor */ BinaryDescriptorMatcher::BinaryDescriptorMatcher() @@ -583,3 +587,5 @@ void BinaryDescriptorMatcher::radiusMatch( const Mat& queryDescriptors, std::vec delete numres; } +} +} diff --git a/modules/line_descriptor/src/draw.cpp b/modules/line_descriptor/src/draw.cpp index 4d046c2c8..bfd1680a2 100644 --- a/modules/line_descriptor/src/draw.cpp +++ b/modules/line_descriptor/src/draw.cpp @@ -43,6 +43,8 @@ namespace cv { +namespace line_descriptor +{ /* draw matches between two images */ void drawLineMatches( const Mat& img1, const std::vector& keylines1, const Mat& img2, const std::vector& keylines2, const std::vector& matches1to2, Mat& outImg, const Scalar& matchColor, const Scalar& singleLineColor, @@ -185,3 +187,4 @@ void drawKeylines( const Mat& image, const std::vector& keylines, Mat& } } +} diff --git a/modules/line_descriptor/src/line_descriptor_init.cpp b/modules/line_descriptor/src/line_descriptor_init.cpp index cc29428aa..afa6a3cfc 100644 --- a/modules/line_descriptor/src/line_descriptor_init.cpp +++ b/modules/line_descriptor/src/line_descriptor_init.cpp @@ -43,6 +43,8 @@ namespace cv { +namespace line_descriptor +{ CV_INIT_ALGORITHM( BinaryDescriptor, "BINARY.DESCRIPTOR", ); CV_INIT_ALGORITHM( BinaryDescriptorMatcher, "BINARY.DESCRIPTOR.MATCHER", ); @@ -59,3 +61,4 @@ bool initModule_line_descriptor( void ) } } +} diff --git a/modules/line_descriptor/src/precomp.hpp b/modules/line_descriptor/src/precomp.hpp index 219b981e7..024e89060 100644 --- a/modules/line_descriptor/src/precomp.hpp +++ b/modules/line_descriptor/src/precomp.hpp @@ -66,6 +66,7 @@ #include #include #include +#include #include "opencv2/line_descriptor.hpp" diff --git a/modules/line_descriptor/test/test_descriptors_regression.cpp b/modules/line_descriptor/test/test_descriptors_regression.cpp index 5741e37ab..947e6d7b0 100644 --- a/modules/line_descriptor/test/test_descriptors_regression.cpp +++ b/modules/line_descriptor/test/test_descriptors_regression.cpp @@ -42,6 +42,7 @@ #include "test_precomp.hpp" using namespace cv; +using namespace cv::line_descriptor; /****************************************************************************************\ * Regression tests for line detector comparing keylines. * diff --git a/modules/line_descriptor/test/test_detector_regression.cpp b/modules/line_descriptor/test/test_detector_regression.cpp index ce39ef0e1..ea128ee7a 100644 --- a/modules/line_descriptor/test/test_detector_regression.cpp +++ b/modules/line_descriptor/test/test_detector_regression.cpp @@ -42,6 +42,7 @@ #include "test_precomp.hpp" using namespace cv; +using namespace cv::line_descriptor; /****************************************************************************************\ * Regression tests for line detector comparing keylines. * diff --git a/modules/line_descriptor/test/test_matcher_regression.cpp b/modules/line_descriptor/test/test_matcher_regression.cpp index 8212f5ac8..df649c0d6 100644 --- a/modules/line_descriptor/test/test_matcher_regression.cpp +++ b/modules/line_descriptor/test/test_matcher_regression.cpp @@ -42,6 +42,7 @@ #include "test_precomp.hpp" using namespace cv; +using namespace cv::line_descriptor; class CV_BinaryDescriptorMatcherTest : public cvtest::BaseTest {