diff --git a/modules/saliency/include/opencv2/saliency/saliencySpecializedClasses.hpp b/modules/saliency/include/opencv2/saliency/saliencySpecializedClasses.hpp index ffd05fb0d..2db8dc68b 100644 --- a/modules/saliency/include/opencv2/saliency/saliencySpecializedClasses.hpp +++ b/modules/saliency/include/opencv2/saliency/saliencySpecializedClasses.hpp @@ -270,7 +270,7 @@ private: // long-term template, regardless of any subsequent background changes. A relatively large (eg gamma=3) will //restrain the generation of ghosts. - int Ainc;// Activity Incrementation; + uchar Ainc;// Activity Incrementation; int Bmax;// Upper-bound value for pixel activity int Bth;// Max activity threshold int Binc, Bdec;// Threshold for pixel-level decision threshold (epslon) adaptation diff --git a/modules/saliency/perf/perf_motionSaliencyBinWangApr2014.cpp b/modules/saliency/perf/perf_motionSaliencyBinWangApr2014.cpp index f692609bf..5e641d9f4 100644 --- a/modules/saliency/perf/perf_motionSaliencyBinWangApr2014.cpp +++ b/modules/saliency/perf/perf_motionSaliencyBinWangApr2014.cpp @@ -65,7 +65,7 @@ PERF_TEST_P(sal, motionSaliencyBinWangApr2014, testing::Values(TESTSET_NAMES)) int startFrame=0; Mat frame; Mat saliencyMap; - int videoSize=0; + double videoSize=0; Ptr saliencyAlgorithm = saliency::Saliency::create( "BinWangApr2014" ); diff --git a/modules/saliency/perf/perf_objectnessBING.cpp b/modules/saliency/perf/perf_objectnessBING.cpp index a3b2b47f0..6b502585e 100644 --- a/modules/saliency/perf/perf_objectnessBING.cpp +++ b/modules/saliency/perf/perf_objectnessBING.cpp @@ -58,7 +58,7 @@ typedef perf::TestBaseWithParam sal; void getMatOfRects( const vector& saliencyMap, Mat& bbs_mat ) { - for ( size_t b = 0; b < saliencyMap.size(); b++ ) + for ( int b = 0; b < (int)saliencyMap.size(); b++ ) { bbs_mat.at( b, 0 ) = saliencyMap[b].val[0]; bbs_mat.at( b, 1 ) = saliencyMap[b].val[1]; @@ -101,7 +101,7 @@ PERF_TEST_P(sal, objectnessBING, testing::Values(BING_IMAGES)) } //end CYCLE //save the bounding boxes in a Mat - Mat bbs_mat( saliencyMap.size(), 4, CV_32F ); + Mat bbs_mat( (int)saliencyMap.size(), 4, CV_32F ); getMatOfRects( saliencyMap, bbs_mat ); SANITY_CHECK( bbs_mat); diff --git a/modules/saliency/src/motionSaliencyBinWangApr2014.cpp b/modules/saliency/src/motionSaliencyBinWangApr2014.cpp index 873e77cef..836cff7f4 100644 --- a/modules/saliency/src/motionSaliencyBinWangApr2014.cpp +++ b/modules/saliency/src/motionSaliencyBinWangApr2014.cpp @@ -327,7 +327,7 @@ bool MotionSaliencyBinWangApr2014::templateOrdering() Mat dstMask, tempMat, dstMask2, dstMask3; Mat convertMat1, convertMat2; - int backGroundModelSize = backgroundModel.size(); + int backGroundModelSize = (int)backgroundModel.size(); std::vector > channelSplit( backGroundModelSize ); for ( int i = 0; i < backGroundModelSize; i++ )