All modules (except ocl and gpu) compiles and pass tests

This commit is contained in:
Andrey Kamaev
2013-03-20 20:13:46 +04:00
parent 762aefd71b
commit 2ad7b97f1c
91 changed files with 606 additions and 604 deletions

View File

@@ -150,7 +150,7 @@ public:
virtual void read(const FileNode& fn)
{
CV_Assert( (std::string)fn["name"] == name_ );
CV_Assert( (cv::String)fn["name"] == name_ );
history = (int)fn["history"];
nmixtures = (int)fn["nmixtures"];
backgroundRatio = (double)fn["backgroundRatio"];
@@ -167,7 +167,7 @@ protected:
double varThreshold;
double backgroundRatio;
double noiseSigma;
std::string name_;
cv::String name_;
};

View File

@@ -251,7 +251,7 @@ public:
virtual void read(const FileNode& fn)
{
CV_Assert( (std::string)fn["name"] == name_ );
CV_Assert( (cv::String)fn["name"] == name_ );
history = (int)fn["history"];
nmixtures = (int)fn["nmixtures"];
backgroundRatio = (float)fn["backgroundRatio"];
@@ -320,7 +320,7 @@ protected:
//Tau= 0.5 means that if pixel is more than 2 times darker then it is not shadow
//See: Prati,Mikic,Trivedi,Cucchiarra,"Detecting Moving Shadows...",IEEE PAMI,2003.
std::string name_;
cv::String name_;
};
struct GaussBGStatModel2Params

View File

@@ -152,7 +152,7 @@ public:
virtual void read(const FileNode& fn)
{
CV_Assert( (std::string)fn["name"] == name_ );
CV_Assert( (cv::String)fn["name"] == name_ );
maxFeatures = (int)fn["maxFeatures"];
learningRate = (double)fn["defaultLearningRate"];
numInitializationFrames = (int)fn["numFrames"];
@@ -189,7 +189,7 @@ private:
Size frameSize_;
int frameNum_;
std::string name_;
cv::String name_;
Mat_<int> nfeatures_;
Mat_<unsigned int> colors_;