Commit dcee8839 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

fixed MSVC warnings and iOS framework compile error

parent b37a641c
...@@ -86,7 +86,7 @@ namespace cv ...@@ -86,7 +86,7 @@ namespace cv
void setDescriptorChannels(int dch) { descriptor_channels = dch; } void setDescriptorChannels(int dch) { descriptor_channels = dch; }
int getDescriptorChannels() const { return descriptor_channels; } int getDescriptorChannels() const { return descriptor_channels; }
void setThreshold(double threshold_) { threshold = threshold_; } void setThreshold(double threshold_) { threshold = (float)threshold_; }
double getThreshold() const { return threshold; } double getThreshold() const { return threshold; }
void setNOctaves(int octaves_) { octaves = octaves_; } void setNOctaves(int octaves_) { octaves = octaves_; }
......
...@@ -75,7 +75,7 @@ namespace cv ...@@ -75,7 +75,7 @@ namespace cv
void setUpright(bool upright_) { upright = upright_; } void setUpright(bool upright_) { upright = upright_; }
bool getUpright() const { return upright; } bool getUpright() const { return upright; }
void setThreshold(double threshold_) { threshold = threshold_; } void setThreshold(double threshold_) { threshold = (float)threshold_; }
double getThreshold() const { return threshold; } double getThreshold() const { return threshold; }
void setNOctaves(int octaves_) { octaves = octaves_; } void setNOctaves(int octaves_) { octaves = octaves_; }
......
...@@ -44,9 +44,5 @@ ...@@ -44,9 +44,5 @@
bool cv::initAll() bool cv::initAll()
{ {
return true return true;
#ifdef HAVE_OPENCV_VIDEO
&& initModule_video()
#endif
;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment