generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed MSVC warnings and iOS framework compile error

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-10-18 21:58:34 +04:00
parent b37a641cc9
commit dcee883961
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/features2d/src/akaze.cpp
View File

@ -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_; }

2
modules/features2d/src/kaze.cpp
View File

@ -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_; }

6
modules/world/src/world_init.cpp
View File

@ -44,9 +44,5 @@
bool cv::initAll() bool cv::initAll()
{ {
return true return true;
#ifdef HAVE_OPENCV_VIDEO
&& initModule_video()
#endif
;
} }