From 82c54104d6901e03027240cd9c6866f6b2509d0a Mon Sep 17 00:00:00 2001 From: Erik Karlsson Date: Tue, 10 Mar 2015 01:39:43 +0100 Subject: [PATCH] Fix warnings on Win x64 --- modules/photo/src/denoising.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/photo/src/denoising.cpp b/modules/photo/src/denoising.cpp index 5243b43..fb38893 100644 --- a/modules/photo/src/denoising.cpp +++ b/modules/photo/src/denoising.cpp @@ -55,7 +55,7 @@ void cv::fastNlMeansDenoising( InputArray _src, OutputArray _dst, float h, void cv::fastNlMeansDenoising( InputArray _src, OutputArray _dst, const std::vector& h, int templateWindowSize, int searchWindowSize) { - int hn = h.size(); + int hn = (int)h.size(); CV_Assert(hn == 1 || hn == CV_MAT_CN(_src.type())); Size src_size = _src.size(); @@ -126,7 +126,7 @@ void cv::fastNlMeansDenoisingAbs( InputArray _src, OutputArray _dst, float h, void cv::fastNlMeansDenoisingAbs( InputArray _src, OutputArray _dst, const std::vector& h, int templateWindowSize, int searchWindowSize) { - int hn = h.size(); + int hn = (int)h.size(); CV_Assert(hn == 1 || hn == CV_MAT_CN(_src.type())); Size src_size = _src.size(); @@ -309,7 +309,7 @@ void cv::fastNlMeansDenoisingMulti( InputArrayOfArrays _srcImgs, OutputArray _ds srcImgs, imgToDenoiseIndex, temporalWindowSize, templateWindowSize, searchWindowSize); - int hn = h.size(); + int hn = (int)h.size(); CV_Assert(hn == 1 || hn == CV_MAT_CN(srcImgs[0].type())); _dst.create(srcImgs[0].size(), srcImgs[0].type()); @@ -385,7 +385,7 @@ void cv::fastNlMeansDenoisingMultiAbs( InputArrayOfArrays _srcImgs, OutputArray srcImgs, imgToDenoiseIndex, temporalWindowSize, templateWindowSize, searchWindowSize); - int hn = h.size(); + int hn = (int)h.size(); CV_Assert(hn == 1 || hn == CV_MAT_CN(srcImgs[0].type())); _dst.create(srcImgs[0].size(), srcImgs[0].type()); -- 2.7.4