suppress warnings

pull/3315/head
Adrien BAK 10 years ago
parent 53d11f490d
commit 9972059476
  1. 2
      modules/photo/include/opencv2/photo.hpp
  2. 2
      modules/photo/src/seamless_cloning.cpp
  3. 4
      modules/photo/src/seamless_cloning_impl.cpp
  4. 2
      modules/photo/test/test_npr.cpp

@ -315,7 +315,7 @@ CV_EXPORTS_W void illuminationChange(InputArray src, InputArray mask, OutputArra
float alpha = 0.2f, float beta = 0.4f);
CV_EXPORTS_W void textureFlattening(InputArray src, InputArray mask, OutputArray dst,
double low_threshold = 30, double high_threshold = 45,
float low_threshold = 30, float high_threshold = 45,
int kernel_size = 3);
CV_EXPORTS_W void edgePreservingFilter(InputArray src, OutputArray dst, int flags = 1,

@ -167,7 +167,7 @@ void cv::illuminationChange(InputArray _src, InputArray _mask, OutputArray _dst,
}
void cv::textureFlattening(InputArray _src, InputArray _mask, OutputArray _dst,
double low_threshold, double high_threshold, int kernel_size)
float low_threshold, float high_threshold, int kernel_size)
{
Mat src = _src.getMat();

@ -252,12 +252,12 @@ void Cloning::initVariables(const Mat &destination, const Mat &binaryMask)
const int w = destination.cols;
filter_X.resize(w - 2);
for(int i = 0 ; i < w-2 ; ++i)
filter_X[i] = 2.0f * std::cos(CV_PI * (i + 1) / (w - 1));
filter_X[i] = 2.0f * std::cos(static_cast<float>(CV_PI) * (i + 1) / (w - 1));
const int h = destination.rows;
filter_Y.resize(h - 2);
for(int j = 0 ; j < h - 2 ; ++j)
filter_Y[j] = 2.0f * std::cos(CV_PI * (j + 1) / (h - 1));
filter_Y[j] = 2.0f * std::cos(static_cast<float>(CV_PI) * (j + 1) / (h - 1));
}
void Cloning::computeDerivatives(const Mat& destination, const Mat &patch, const Mat &binaryMask)

@ -47,7 +47,7 @@
using namespace cv;
using namespace std;
static const double numerical_precision = 1.;
static const double numerical_precision = 100.;
TEST(Photo_NPR_EdgePreserveSmoothing_RecursiveFilter, regression)
{

Loading…
Cancel
Save