Skip to content

Commit 83f80a3

Browse files
jacosovrasov
authored andcommitted
windows warning wip
1 parent b691b74 commit 83f80a3

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

modules/saliency/include/opencv2/saliency/saliencySpecializedClasses.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ class CV_EXPORTS_W MotionSaliencyBinWangApr2014 : public MotionSaliency
270270
// long-term template, regardless of any subsequent background changes. A relatively large (eg gamma=3) will
271271
//restrain the generation of ghosts.
272272

273-
int Ainc;// Activity Incrementation;
273+
uchar Ainc;// Activity Incrementation;
274274
int Bmax;// Upper-bound value for pixel activity
275275
int Bth;// Max activity threshold
276276
int Binc, Bdec;// Threshold for pixel-level decision threshold (epslon) adaptation

modules/saliency/perf/perf_motionSaliencyBinWangApr2014.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ PERF_TEST_P(sal, motionSaliencyBinWangApr2014, testing::Values(TESTSET_NAMES))
6565
int startFrame=0;
6666
Mat frame;
6767
Mat saliencyMap;
68-
int videoSize=0;
68+
double videoSize=0;
6969

7070
Ptr<saliency::Saliency> saliencyAlgorithm = saliency::Saliency::create( "BinWangApr2014" );
7171

modules/saliency/perf/perf_objectnessBING.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ typedef perf::TestBaseWithParam<std::string> sal;
5858

5959
void getMatOfRects( const vector<Vec4i>& saliencyMap, Mat& bbs_mat )
6060
{
61-
for ( size_t b = 0; b < saliencyMap.size(); b++ )
61+
for ( int b = 0; b < (int)saliencyMap.size(); b++ )
6262
{
6363
bbs_mat.at<int>( b, 0 ) = saliencyMap[b].val[0];
6464
bbs_mat.at<int>( b, 1 ) = saliencyMap[b].val[1];
@@ -101,7 +101,7 @@ PERF_TEST_P(sal, objectnessBING, testing::Values(BING_IMAGES))
101101
} //end CYCLE
102102

103103
//save the bounding boxes in a Mat
104-
Mat bbs_mat( saliencyMap.size(), 4, CV_32F );
104+
Mat bbs_mat( (int)saliencyMap.size(), 4, CV_32F );
105105
getMatOfRects( saliencyMap, bbs_mat );
106106

107107
SANITY_CHECK( bbs_mat);

modules/saliency/src/motionSaliencyBinWangApr2014.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ bool MotionSaliencyBinWangApr2014::templateOrdering()
327327

328328
Mat dstMask, tempMat, dstMask2, dstMask3;
329329
Mat convertMat1, convertMat2;
330-
int backGroundModelSize = backgroundModel.size();
330+
int backGroundModelSize = (int)backgroundModel.size();
331331

332332
std::vector<std::vector<Mat> > channelSplit( backGroundModelSize );
333333
for ( int i = 0; i < backGroundModelSize; i++ )

0 commit comments

Comments
 (0)