From b83bff0c8fe81dde0f0d23ace43c95d0debf6845 Mon Sep 17 00:00:00 2001 From: biagio montesano Date: Fri, 5 Sep 2014 21:12:52 +0200 Subject: [PATCH 1/2] Removed optim dependence --- modules/line_descriptor/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/line_descriptor/CMakeLists.txt b/modules/line_descriptor/CMakeLists.txt index 1774c6fabe..91a54ce3ee 100644 --- a/modules/line_descriptor/CMakeLists.txt +++ b/modules/line_descriptor/CMakeLists.txt @@ -1,4 +1,4 @@ set(the_description "Line descriptor") -ocv_define_module(line_descriptor opencv_features2d opencv_imgproc opencv_optim) +ocv_define_module(line_descriptor opencv_features2d opencv_imgproc opencv_highgui) From b0cb1c0d82b96c73ad0ba042acd665d5caf221b2 Mon Sep 17 00:00:00 2001 From: biagio montesano Date: Sat, 6 Sep 2014 11:12:50 +0200 Subject: [PATCH 2/2] Corrected possible loss of precision --- modules/line_descriptor/src/binary_descriptor_matcher.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/line_descriptor/src/binary_descriptor_matcher.cpp b/modules/line_descriptor/src/binary_descriptor_matcher.cpp index 0e10a52419..54b17869e4 100644 --- a/modules/line_descriptor/src/binary_descriptor_matcher.cpp +++ b/modules/line_descriptor/src/binary_descriptor_matcher.cpp @@ -871,7 +871,7 @@ BinaryDescriptorMatcher::BucketGroup::~BucketGroup() { } - void BinaryDescriptorMatcher::BucketGroup::insert_value( std::vector& vec, int index, UINT32 data ) +void BinaryDescriptorMatcher::BucketGroup::insert_value( std::vector& vec, int index, UINT32 data ) { if( vec.size() > 1 ) { @@ -915,7 +915,7 @@ void BinaryDescriptorMatcher::BucketGroup::push_value( std::vector& ve else { - vec = std::vector < uint32_t > ( 2 + ARRAY_RESIZE_ADD_FACTOR, 0 ); + vec = std::vector < uint32_t > ( 2 + (uint32_t) ARRAY_RESIZE_ADD_FACTOR, 0 ); vec[0] = 1; vec[1] = 1; vec[2] = Data;