Commit 83f80a34 authored by jaco's avatar jaco Committed by Vladislav Sovrasov

windows warning wip

parent b691b744
...@@ -270,7 +270,7 @@ private: ...@@ -270,7 +270,7 @@ private:
// long-term template, regardless of any subsequent background changes. A relatively large (eg gamma=3) will // long-term template, regardless of any subsequent background changes. A relatively large (eg gamma=3) will
//restrain the generation of ghosts. //restrain the generation of ghosts.
int Ainc;// Activity Incrementation; uchar Ainc;// Activity Incrementation;
int Bmax;// Upper-bound value for pixel activity int Bmax;// Upper-bound value for pixel activity
int Bth;// Max activity threshold int Bth;// Max activity threshold
int Binc, Bdec;// Threshold for pixel-level decision threshold (epslon) adaptation int Binc, Bdec;// Threshold for pixel-level decision threshold (epslon) adaptation
......
...@@ -65,7 +65,7 @@ PERF_TEST_P(sal, motionSaliencyBinWangApr2014, testing::Values(TESTSET_NAMES)) ...@@ -65,7 +65,7 @@ PERF_TEST_P(sal, motionSaliencyBinWangApr2014, testing::Values(TESTSET_NAMES))
int startFrame=0; int startFrame=0;
Mat frame; Mat frame;
Mat saliencyMap; Mat saliencyMap;
int videoSize=0; double videoSize=0;
Ptr<saliency::Saliency> saliencyAlgorithm = saliency::Saliency::create( "BinWangApr2014" ); Ptr<saliency::Saliency> saliencyAlgorithm = saliency::Saliency::create( "BinWangApr2014" );
......
...@@ -58,7 +58,7 @@ typedef perf::TestBaseWithParam<std::string> sal; ...@@ -58,7 +58,7 @@ typedef perf::TestBaseWithParam<std::string> sal;
void getMatOfRects( const vector<Vec4i>& saliencyMap, Mat& bbs_mat ) void getMatOfRects( const vector<Vec4i>& 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<int>( b, 0 ) = saliencyMap[b].val[0]; bbs_mat.at<int>( b, 0 ) = saliencyMap[b].val[0];
bbs_mat.at<int>( b, 1 ) = saliencyMap[b].val[1]; bbs_mat.at<int>( b, 1 ) = saliencyMap[b].val[1];
...@@ -101,7 +101,7 @@ PERF_TEST_P(sal, objectnessBING, testing::Values(BING_IMAGES)) ...@@ -101,7 +101,7 @@ PERF_TEST_P(sal, objectnessBING, testing::Values(BING_IMAGES))
} //end CYCLE } //end CYCLE
//save the bounding boxes in a Mat //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 ); getMatOfRects( saliencyMap, bbs_mat );
SANITY_CHECK( bbs_mat); SANITY_CHECK( bbs_mat);
......
...@@ -327,7 +327,7 @@ bool MotionSaliencyBinWangApr2014::templateOrdering() ...@@ -327,7 +327,7 @@ bool MotionSaliencyBinWangApr2014::templateOrdering()
Mat dstMask, tempMat, dstMask2, dstMask3; Mat dstMask, tempMat, dstMask2, dstMask3;
Mat convertMat1, convertMat2; Mat convertMat1, convertMat2;
int backGroundModelSize = backgroundModel.size(); int backGroundModelSize = (int)backgroundModel.size();
std::vector<std::vector<Mat> > channelSplit( backGroundModelSize ); std::vector<std::vector<Mat> > channelSplit( backGroundModelSize );
for ( int i = 0; i < backGroundModelSize; i++ ) for ( int i = 0; i < backGroundModelSize; i++ )
......
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