From d1265a9d944e2f95ff260454adc574e8f5aaa40f Mon Sep 17 00:00:00 2001 From: biagio montesano Date: Thu, 31 Jul 2014 11:56:58 +0200 Subject: [PATCH] Converted KeyLine from class to struct --- .../include/opencv2/line_descriptor/descriptor.hpp | 2 +- modules/line_descriptor/src/binary_descriptor_matcher.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/line_descriptor/include/opencv2/line_descriptor/descriptor.hpp b/modules/line_descriptor/include/opencv2/line_descriptor/descriptor.hpp index 86366323e..bc7ac1e80 100644 --- a/modules/line_descriptor/include/opencv2/line_descriptor/descriptor.hpp +++ b/modules/line_descriptor/include/opencv2/line_descriptor/descriptor.hpp @@ -58,7 +58,7 @@ namespace cv CV_EXPORTS bool initModule_line_descriptor(); -class CV_EXPORTS_W KeyLine +struct CV_EXPORTS_W_SIMPLE KeyLine { public: /* orientation of the line */ diff --git a/modules/line_descriptor/src/binary_descriptor_matcher.cpp b/modules/line_descriptor/src/binary_descriptor_matcher.cpp index 38a82b13c..541f6d159 100644 --- a/modules/line_descriptor/src/binary_descriptor_matcher.cpp +++ b/modules/line_descriptor/src/binary_descriptor_matcher.cpp @@ -105,7 +105,7 @@ void BinaryDescriptorMatcher::checkKDistances( UINT32 * numres, int k, std::vect { if( ( * ( numres_tmp + j ) ) > 0 ) { - for ( int i = 0; i < ( * ( numres_tmp + j ) ) && k_to_found > 0; i++ ) + for ( int i = 0; i < (int)( * ( numres_tmp + j ) ) && k_to_found > 0; i++ ) { k_distances.push_back( j ); k_to_found--;