diff --git a/modules/features2d/src/akaze.cpp b/modules/features2d/src/akaze.cpp index 839ce7512f..4037d1c5c3 100644 --- a/modules/features2d/src/akaze.cpp +++ b/modules/features2d/src/akaze.cpp @@ -86,7 +86,7 @@ namespace cv void setDescriptorChannels(int dch) { descriptor_channels = dch; } int getDescriptorChannels() const { return descriptor_channels; } - void setThreshold(double threshold_) { threshold = threshold_; } + void setThreshold(double threshold_) { threshold = (float)threshold_; } double getThreshold() const { return threshold; } void setNOctaves(int octaves_) { octaves = octaves_; } diff --git a/modules/features2d/src/kaze.cpp b/modules/features2d/src/kaze.cpp index b98467c51e..327b46ae26 100644 --- a/modules/features2d/src/kaze.cpp +++ b/modules/features2d/src/kaze.cpp @@ -75,7 +75,7 @@ namespace cv void setUpright(bool upright_) { upright = upright_; } bool getUpright() const { return upright; } - void setThreshold(double threshold_) { threshold = threshold_; } + void setThreshold(double threshold_) { threshold = (float)threshold_; } double getThreshold() const { return threshold; } void setNOctaves(int octaves_) { octaves = octaves_; } diff --git a/modules/world/src/world_init.cpp b/modules/world/src/world_init.cpp index af2a6d9318..a20823127c 100644 --- a/modules/world/src/world_init.cpp +++ b/modules/world/src/world_init.cpp @@ -44,9 +44,5 @@ bool cv::initAll() { - return true -#ifdef HAVE_OPENCV_VIDEO - && initModule_video() -#endif - ; + return true; }