eliminate compiler warnings

pull/807/head
Alexander Alekhin 9 years ago
parent c1101a02ee
commit 5f8d3d756b
  1. 2
      modules/saliency/CMakeLists.txt
  2. 4
      modules/ximgproc/test/test_adaptive_manifold_ref_impl.cpp

@ -2,3 +2,5 @@ set(the_description "Saliency API")
set(OPENCV_MODULE_IS_PART_OF_WORLD OFF)
ocv_define_module(saliency opencv_imgproc opencv_highgui opencv_features2d WRAP python)
ocv_warnings_disable(CMAKE_CXX_FLAGS -Woverloaded-virtual)

@ -253,7 +253,7 @@ namespace
const double Lr = 1.0 - sigma_r;
return max(2, static_cast<int>(ceil(Hs * Lr)));
}
/*
void ensureSizeIsEnough(int rows, int cols, int type, Mat& m)
{
if (m.empty() || m.type() != type || m.data != m.datastart)
@ -283,7 +283,7 @@ namespace
{
ensureSizeIsEnough(size.height, size.width, type, m);
}
*/
template <typename T>
inline void ensureSizeIsEnough(int rows, int cols, Mat_<T>& m)
{

Loading…
Cancel
Save