Commit bc66cc27 authored by jaco's avatar jaco

std namespace fixed

parent cfc338b8
...@@ -128,7 +128,7 @@ class CV_EXPORTS_W MotionSaliencyBinWangApr2014 : public MotionSaliency ...@@ -128,7 +128,7 @@ class CV_EXPORTS_W MotionSaliencyBinWangApr2014 : public MotionSaliency
//bool decisionThresholdAdaptation(); //bool decisionThresholdAdaptation();
// changing structure // changing structure
vector<Ptr<Mat> > backgroundModel; // The vector represents the background template T0---TK of reference paper. std::vector<Ptr<Mat> > backgroundModel; // The vector represents the background template T0---TK of reference paper.
// Matrices are two-channel matrix. In the first layer there are the B (background value) // Matrices are two-channel matrix. In the first layer there are the B (background value)
// for each pixel. In the second layer, there are the C (efficacy) value for each pixel // for each pixel. In the second layer, there are the C (efficacy) value for each pixel
Mat potentialBackground; // Two channel Matrix. For each pixel, in the first level there are the Ba value (potential background value) Mat potentialBackground; // Two channel Matrix. For each pixel, in the first level there are the Ba value (potential background value)
......
...@@ -297,7 +297,7 @@ bool MotionSaliencyBinWangApr2014::lowResolutionDetection( const Mat& image, Mat ...@@ -297,7 +297,7 @@ bool MotionSaliencyBinWangApr2014::lowResolutionDetection( const Mat& image, Mat
} }
bool inline pairCompare( pair<float, float> t, pair<float, float> t_plusOne ) bool inline pairCompare( std::pair<float, float> t, std::pair<float, float> t_plusOne )
{ {
return ( t.second > t_plusOne.second ); return ( t.second > t_plusOne.second );
...@@ -307,7 +307,7 @@ bool inline pairCompare( pair<float, float> t, pair<float, float> t_plusOne ) ...@@ -307,7 +307,7 @@ bool inline pairCompare( pair<float, float> t, pair<float, float> t_plusOne )
// Background model maintenance functions // Background model maintenance functions
bool MotionSaliencyBinWangApr2014::templateOrdering() bool MotionSaliencyBinWangApr2014::templateOrdering()
{ {
vector<pair<float, float> > pixelTemplates( backgroundModel.size() ); std::vector<std::pair<float, float> > pixelTemplates( backgroundModel.size() );
Vec2f* bgModel_0P; Vec2f* bgModel_0P;
Vec2f* bgModel_1P; Vec2f* bgModel_1P;
......
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