fixed MSVC warnings and iOS framework compile error

pull/3348/head
Vadim Pisarevsky 10 years ago
parent b37a641cc9
commit dcee883961
  1. 2
      modules/features2d/src/akaze.cpp
  2. 2
      modules/features2d/src/kaze.cpp
  3. 6
      modules/world/src/world_init.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_; }

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

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

Loading…
Cancel
Save