From bc66cc27d3ccb866dae4483f175085d24c306a50 Mon Sep 17 00:00:00 2001 From: jaco Date: Fri, 8 Aug 2014 18:40:19 +0200 Subject: [PATCH] std namespace fixed --- .../include/opencv2/saliency/saliencySpecializedClasses.hpp | 2 +- modules/saliency/src/motionSaliencyBinWangApr2014.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/saliency/include/opencv2/saliency/saliencySpecializedClasses.hpp b/modules/saliency/include/opencv2/saliency/saliencySpecializedClasses.hpp index 9833983ad..956a51ded 100644 --- a/modules/saliency/include/opencv2/saliency/saliencySpecializedClasses.hpp +++ b/modules/saliency/include/opencv2/saliency/saliencySpecializedClasses.hpp @@ -128,7 +128,7 @@ class CV_EXPORTS_W MotionSaliencyBinWangApr2014 : public MotionSaliency //bool decisionThresholdAdaptation(); // changing structure - vector > backgroundModel; // The vector represents the background template T0---TK of reference paper. + std::vector > 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) diff --git a/modules/saliency/src/motionSaliencyBinWangApr2014.cpp b/modules/saliency/src/motionSaliencyBinWangApr2014.cpp index fdf0205ec..48b75a73f 100644 --- a/modules/saliency/src/motionSaliencyBinWangApr2014.cpp +++ b/modules/saliency/src/motionSaliencyBinWangApr2014.cpp @@ -297,7 +297,7 @@ bool MotionSaliencyBinWangApr2014::lowResolutionDetection( const Mat& image, Mat } -bool inline pairCompare( pair t, pair t_plusOne ) +bool inline pairCompare( std::pair t, std::pair t_plusOne ) { return ( t.second > t_plusOne.second ); @@ -307,7 +307,7 @@ bool inline pairCompare( pair t, pair t_plusOne ) // Background model maintenance functions bool MotionSaliencyBinWangApr2014::templateOrdering() { - vector > pixelTemplates( backgroundModel.size() ); + std::vector > pixelTemplates( backgroundModel.size() ); Vec2f* bgModel_0P; Vec2f* bgModel_1P;