From 918645d1195b1da3b13b4bdd8929ef2ad7dfc73c Mon Sep 17 00:00:00 2001 From: Bleach Date: Mon, 22 Aug 2016 14:23:31 +0300 Subject: [PATCH] fix vs2010 build error --- modules/optflow/src/dis_flow.cpp | 2 +- modules/optflow/src/pcaflow.cpp | 4 ++-- modules/xphoto/src/learning_based_color_balance.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/optflow/src/dis_flow.cpp b/modules/optflow/src/dis_flow.cpp index a485013cb..3980a467e 100644 --- a/modules/optflow/src/dis_flow.cpp +++ b/modules/optflow/src/dis_flow.cpp @@ -1066,7 +1066,7 @@ void DISOpticalFlowImpl::calc(InputArray I0, InputArray I1, InputOutputArray flo Mat uxy[] = {Ux[finest_scale], Uy[finest_scale]}; merge(uxy, 2, U); resize(U, flowMat, flowMat.size()); - flowMat *= pow(2, finest_scale); + flowMat *= 1 << finest_scale; } void DISOpticalFlowImpl::collectGarbage() diff --git a/modules/optflow/src/pcaflow.cpp b/modules/optflow/src/pcaflow.cpp index c46200368..9eaeb5e56 100644 --- a/modules/optflow/src/pcaflow.cpp +++ b/modules/optflow/src/pcaflow.cpp @@ -226,7 +226,7 @@ void reduceToFlow( const Mat &w1, const Mat &w2, Mat &flow, const Size &basisSiz Mat flowX( size, CV_32F, 0.0f ); Mat flowY( size, CV_32F, 0.0f ); - const float mult = sqrt( size.area() ) * 0.5; + const float mult = sqrt( static_cast(size.area()) ) * 0.5; for ( int i = 0; i < basisSize.width; ++i ) for ( int j = 0; j < basisSize.height; ++j ) @@ -296,7 +296,7 @@ void OpticalFlowPCAFlow::removeOcclusions( UMat &from, UMat &to, std::vector(from.size().area()) ); for ( size_t i = 0; i < predictedFeatures.size(); ++i ) { if ( predictedStatus[i] ) diff --git a/modules/xphoto/src/learning_based_color_balance.cpp b/modules/xphoto/src/learning_based_color_balance.cpp index 49482398b..d9a85631e 100644 --- a/modules/xphoto/src/learning_based_color_balance.cpp +++ b/modules/xphoto/src/learning_based_color_balance.cpp @@ -547,7 +547,7 @@ Vec2f LearningBasedWBImpl::predictIlluminant(vector features) int local_model_size = num_features * feature_model_size; int feature_model_size_leaf = 2 * num_tree_nodes; int local_model_size_leaf = num_features * feature_model_size_leaf; - tree_depth = (int)round(log(num_tree_nodes) / log(2)); + tree_depth = cvRound( (log(static_cast(num_tree_nodes)) / log(2.0f)) ); vector consensus_r, consensus_g; vector all_r, all_g;