Skip to content

O
opencv
Commit 82c54104 authored by Erik Karlsson's avatar Erik Karlsson
Browse files
Options

Fix warnings on Win x64

parent 812edb5f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
modules/photo/src/denoising.cpp
View file @ 82c54104
...@@ -55,7 +55,7 @@ void cv::fastNlMeansDenoising( InputArray _src, OutputArray _dst, float h, ...@@ -55,7 +55,7 @@ void cv::fastNlMeansDenoising( InputArray _src, OutputArray _dst, float h,
void cv::fastNlMeansDenoising( InputArray _src, OutputArray _dst, const std::vector<float>& h, void cv::fastNlMeansDenoising( InputArray _src, OutputArray _dst, const std::vector<float>& h,
int templateWindowSize, int searchWindowSize) int templateWindowSize, int searchWindowSize)
{ {
int hn = h.size(); int hn = (int)h.size();
CV_Assert(hn == 1 || hn == CV_MAT_CN(_src.type())); CV_Assert(hn == 1 || hn == CV_MAT_CN(_src.type()));
Size src_size = _src.size(); Size src_size = _src.size();
...@@ -126,7 +126,7 @@ void cv::fastNlMeansDenoisingAbs( InputArray _src, OutputArray _dst, float h, ...@@ -126,7 +126,7 @@ void cv::fastNlMeansDenoisingAbs( InputArray _src, OutputArray _dst, float h,
void cv::fastNlMeansDenoisingAbs( InputArray _src, OutputArray _dst, const std::vector<float>& h, void cv::fastNlMeansDenoisingAbs( InputArray _src, OutputArray _dst, const std::vector<float>& h,
int templateWindowSize, int searchWindowSize) int templateWindowSize, int searchWindowSize)
{ {
int hn = h.size(); int hn = (int)h.size();
CV_Assert(hn == 1 || hn == CV_MAT_CN(_src.type())); CV_Assert(hn == 1 || hn == CV_MAT_CN(_src.type()));
Size src_size = _src.size(); Size src_size = _src.size();
...@@ -309,7 +309,7 @@ void cv::fastNlMeansDenoisingMulti( InputArrayOfArrays _srcImgs, OutputArray _ds ...@@ -309,7 +309,7 @@ void cv::fastNlMeansDenoisingMulti( InputArrayOfArrays _srcImgs, OutputArray _ds
srcImgs, imgToDenoiseIndex, srcImgs, imgToDenoiseIndex,
temporalWindowSize, templateWindowSize, searchWindowSize); temporalWindowSize, templateWindowSize, searchWindowSize);
int hn = h.size(); int hn = (int)h.size();
CV_Assert(hn == 1 || hn == CV_MAT_CN(srcImgs[0].type())); CV_Assert(hn == 1 || hn == CV_MAT_CN(srcImgs[0].type()));
_dst.create(srcImgs[0].size(), srcImgs[0].type()); _dst.create(srcImgs[0].size(), srcImgs[0].type());
...@@ -385,7 +385,7 @@ void cv::fastNlMeansDenoisingMultiAbs( InputArrayOfArrays _srcImgs, OutputArray ...@@ -385,7 +385,7 @@ void cv::fastNlMeansDenoisingMultiAbs( InputArrayOfArrays _srcImgs, OutputArray
srcImgs, imgToDenoiseIndex, srcImgs, imgToDenoiseIndex,
temporalWindowSize, templateWindowSize, searchWindowSize); temporalWindowSize, templateWindowSize, searchWindowSize);
int hn = h.size(); int hn = (int)h.size();
CV_Assert(hn == 1 || hn == CV_MAT_CN(srcImgs[0].type())); CV_Assert(hn == 1 || hn == CV_MAT_CN(srcImgs[0].type()));
_dst.create(srcImgs[0].size(), srcImgs[0].type()); _dst.create(srcImgs[0].size(), srcImgs[0].type());
......
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