opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-20 12:55:15 +08:00
Code Issues Releases Wiki Activity

std namespace fixed

Browse Source
This commit is contained in:
jaco
2014-08-08 18:40:19 +02:00
parent cfc338b8f9
commit bc66cc27d3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/saliency/include/opencv2/saliency/saliencySpecializedClasses.hpp
View File

@@ -128,7 +128,7 @@ class CV_EXPORTS_W MotionSaliencyBinWangApr2014 : public MotionSaliency
//bool decisionThresholdAdaptation();
// 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)
// 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)

4
modules/saliency/src/motionSaliencyBinWangApr2014.cpp
View File

@@ -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 );
@@ -307,7 +307,7 @@ bool inline pairCompare( pair<float, float> t, pair<float, float> t_plusOne )
// Background model maintenance functions
bool MotionSaliencyBinWangApr2014::templateOrdering()
{
vector<pair<float, float> > pixelTemplates( backgroundModel.size() );
std::vector<std::pair<float, float> > pixelTemplates( backgroundModel.size() );
Vec2f* bgModel_0P;
Vec2f* bgModel_1P;