diff --git a/apps/traincascade/HOGfeatures.cpp b/apps/traincascade/HOGfeatures.cpp index 9a562fcad..8bbdee609 100644 --- a/apps/traincascade/HOGfeatures.cpp +++ b/apps/traincascade/HOGfeatures.cpp @@ -4,6 +4,7 @@ #include "HOGfeatures.h" #include "cascadeclassifier.h" +using namespace std; CvHOGFeatureParams::CvHOGFeatureParams() { diff --git a/apps/traincascade/HOGfeatures.h b/apps/traincascade/HOGfeatures.h index a7f33f608..329c6072c 100644 --- a/apps/traincascade/HOGfeatures.h +++ b/apps/traincascade/HOGfeatures.h @@ -26,13 +26,13 @@ public: virtual void writeFeatures( FileStorage &fs, const Mat& featureMap ) const; protected: virtual void generateFeatures(); - virtual void integralHistogram(const Mat &img, vector &histogram, Mat &norm, int nbins) const; + virtual void integralHistogram(const Mat &img, std::vector &histogram, Mat &norm, int nbins) const; class Feature { public: Feature(); Feature( int offset, int x, int y, int cellW, int cellH ); - float calc( const vector &_hists, const Mat &_normSum, size_t y, int featComponent ) const; + float calc( const std::vector &_hists, const Mat &_normSum, size_t y, int featComponent ) const; void write( FileStorage &fs ) const; void write( FileStorage &fs, int varIdx ) const; @@ -43,10 +43,10 @@ protected: int p0, p1, p2, p3; } fastRect[N_CELLS]; }; - vector features; + std::vector features; Mat normSum; //for nomalization calculation (L1 or L2) - vector hist; + std::vector hist; }; inline float CvHOGEvaluator::operator()(int varIdx, int sampleIdx) const @@ -57,7 +57,7 @@ inline float CvHOGEvaluator::operator()(int varIdx, int sampleIdx) const return features[featureIdx].calc( hist, normSum, sampleIdx, componentIdx); } -inline float CvHOGEvaluator::Feature::calc( const vector& _hists, const Mat& _normSum, size_t y, int featComponent ) const +inline float CvHOGEvaluator::Feature::calc( const std::vector& _hists, const Mat& _normSum, size_t y, int featComponent ) const { float normFactor; float res; diff --git a/apps/traincascade/boost.cpp b/apps/traincascade/boost.cpp index 4f91d5a29..6d1165530 100644 --- a/apps/traincascade/boost.cpp +++ b/apps/traincascade/boost.cpp @@ -160,10 +160,10 @@ CvCascadeBoostParams::CvCascadeBoostParams( int _boostType, void CvCascadeBoostParams::write( FileStorage &fs ) const { - String boostTypeStr = boost_type == CvBoost::DISCRETE ? CC_DISCRETE_BOOST : + string boostTypeStr = boost_type == CvBoost::DISCRETE ? CC_DISCRETE_BOOST : boost_type == CvBoost::REAL ? CC_REAL_BOOST : boost_type == CvBoost::LOGIT ? CC_LOGIT_BOOST : - boost_type == CvBoost::GENTLE ? CC_GENTLE_BOOST : String(); + boost_type == CvBoost::GENTLE ? CC_GENTLE_BOOST : string(); CV_Assert( !boostTypeStr.empty() ); fs << CC_BOOST_TYPE << boostTypeStr; fs << CC_MINHITRATE << minHitRate; @@ -175,7 +175,7 @@ void CvCascadeBoostParams::write( FileStorage &fs ) const bool CvCascadeBoostParams::read( const FileNode &node ) { - String boostTypeStr; + string boostTypeStr; FileNode rnode = node[CC_BOOST_TYPE]; rnode >> boostTypeStr; boost_type = !boostTypeStr.compare( CC_DISCRETE_BOOST ) ? CvBoost::DISCRETE : @@ -213,10 +213,10 @@ void CvCascadeBoostParams::printDefaults() const void CvCascadeBoostParams::printAttrs() const { - String boostTypeStr = boost_type == CvBoost::DISCRETE ? CC_DISCRETE_BOOST : + string boostTypeStr = boost_type == CvBoost::DISCRETE ? CC_DISCRETE_BOOST : boost_type == CvBoost::REAL ? CC_REAL_BOOST : boost_type == CvBoost::LOGIT ? CC_LOGIT_BOOST : - boost_type == CvBoost::GENTLE ? CC_GENTLE_BOOST : String(); + boost_type == CvBoost::GENTLE ? CC_GENTLE_BOOST : string(); CV_Assert( !boostTypeStr.empty() ); cout << "boostType: " << boostTypeStr << endl; cout << "minHitRate: " << minHitRate << endl; @@ -226,7 +226,7 @@ void CvCascadeBoostParams::printAttrs() const cout << "maxWeakCount: " << weak_count << endl; } -bool CvCascadeBoostParams::scanAttr( const String prmName, const String val) +bool CvCascadeBoostParams::scanAttr( const string prmName, const string val) { bool res = true; diff --git a/apps/traincascade/boost.h b/apps/traincascade/boost.h index 16f7c2ce1..2a080484b 100644 --- a/apps/traincascade/boost.h +++ b/apps/traincascade/boost.h @@ -17,7 +17,7 @@ struct CvCascadeBoostParams : CvBoostParams bool read( const FileNode &node ); virtual void printDefaults() const; virtual void printAttrs() const; - virtual bool scanAttr( const String prmName, const String val); + virtual bool scanAttr( const std::string prmName, const std::string val); }; struct CvCascadeBoostTrainData : CvDTreeTrainData diff --git a/apps/traincascade/cascadeclassifier.cpp b/apps/traincascade/cascadeclassifier.cpp index 00674ff8e..66f687691 100644 --- a/apps/traincascade/cascadeclassifier.cpp +++ b/apps/traincascade/cascadeclassifier.cpp @@ -24,10 +24,10 @@ CvCascadeParams::CvCascadeParams( int _stageType, int _featureType ) : stageType void CvCascadeParams::write( FileStorage &fs ) const { - String stageTypeStr = stageType == BOOST ? CC_BOOST : String(); + string stageTypeStr = stageType == BOOST ? CC_BOOST : string(); CV_Assert( !stageTypeStr.empty() ); fs << CC_STAGE_TYPE << stageTypeStr; - String featureTypeStr = featureType == CvFeatureParams::HAAR ? CC_HAAR : + string featureTypeStr = featureType == CvFeatureParams::HAAR ? CC_HAAR : featureType == CvFeatureParams::LBP ? CC_LBP : featureType == CvFeatureParams::HOG ? CC_HOG : 0; @@ -41,7 +41,7 @@ bool CvCascadeParams::read( const FileNode &node ) { if ( node.empty() ) return false; - String stageTypeStr, featureTypeStr; + string stageTypeStr, featureTypeStr; FileNode rnode = node[CC_STAGE_TYPE]; if ( !rnode.isString() ) return false; @@ -96,7 +96,7 @@ void CvCascadeParams::printAttrs() const cout << "sampleHeight: " << winSize.height << endl; } -bool CvCascadeParams::scanAttr( const String prmName, const String val ) +bool CvCascadeParams::scanAttr( const string prmName, const string val ) { bool res = true; if( !prmName.compare( "-stageType" ) ) @@ -126,9 +126,9 @@ bool CvCascadeParams::scanAttr( const String prmName, const String val ) //---------------------------- CascadeClassifier -------------------------------------- -bool CvCascadeClassifier::train( const String _cascadeDirName, - const String _posFilename, - const String _negFilename, +bool CvCascadeClassifier::train( const string _cascadeDirName, + const string _posFilename, + const string _negFilename, int _numPos, int _numNeg, int _precalcValBufSize, int _precalcIdxBufSize, int _numStages, @@ -399,7 +399,7 @@ bool CvCascadeClassifier::readStages( const FileNode &node) #define ICV_HAAR_PARENT_NAME "parent" #define ICV_HAAR_NEXT_NAME "next" -void CvCascadeClassifier::save( const String filename, bool baseFormat ) +void CvCascadeClassifier::save( const string filename, bool baseFormat ) { FileStorage fs( filename, FileStorage::WRITE ); @@ -491,7 +491,7 @@ void CvCascadeClassifier::save( const String filename, bool baseFormat ) fs << "}"; } -bool CvCascadeClassifier::load( const String cascadeDirName ) +bool CvCascadeClassifier::load( const string cascadeDirName ) { FileStorage fs( cascadeDirName + CC_PARAMS_FILENAME, FileStorage::READ ); if ( !fs.isOpened() ) diff --git a/apps/traincascade/cascadeclassifier.h b/apps/traincascade/cascadeclassifier.h index 6890068c2..3eb50b526 100644 --- a/apps/traincascade/cascadeclassifier.h +++ b/apps/traincascade/cascadeclassifier.h @@ -77,7 +77,7 @@ public: void printDefaults() const; void printAttrs() const; - bool scanAttr( const String prmName, const String val ); + bool scanAttr( const std::string prmName, const std::string val ); int stageType; int featureType; @@ -87,9 +87,9 @@ public: class CvCascadeClassifier { public: - bool train( const String _cascadeDirName, - const String _posFilename, - const String _negFilename, + bool train( const std::string _cascadeDirName, + const std::string _posFilename, + const std::string _negFilename, int _numPos, int _numNeg, int _precalcValBufSize, int _precalcIdxBufSize, int _numStages, @@ -99,8 +99,8 @@ public: bool baseFormatSave = false ); private: int predict( int sampleIdx ); - void save( const String cascadeDirName, bool baseFormat = false ); - bool load( const String cascadeDirName ); + void save( const std::string cascadeDirName, bool baseFormat = false ); + bool load( const std::string cascadeDirName ); bool updateTrainingSet( double& acceptanceRatio ); int fillPassedSamples( int first, int count, bool isPositive, int64& consumed ); @@ -117,7 +117,7 @@ private: Ptr stageParams; Ptr featureEvaluator; - vector< Ptr > stageClassifiers; + std::vector< Ptr > stageClassifiers; CvCascadeImageReader imgReader; int numStages, curNumSamples; int numPos, numNeg; diff --git a/apps/traincascade/features.cpp b/apps/traincascade/features.cpp index effa4dcc5..9629509f3 100644 --- a/apps/traincascade/features.cpp +++ b/apps/traincascade/features.cpp @@ -24,7 +24,7 @@ CvParams::CvParams() : name( "params" ) {} void CvParams::printDefaults() const { cout << "--" << name << "--" << endl; } void CvParams::printAttrs() const {} -bool CvParams::scanAttr( const String, const String ) { return false; } +bool CvParams::scanAttr( const string, const string ) { return false; } //---------------------------- FeatureParams -------------------------------------- diff --git a/apps/traincascade/haarfeatures.cpp b/apps/traincascade/haarfeatures.cpp index 0298b42a7..9f8bce083 100644 --- a/apps/traincascade/haarfeatures.cpp +++ b/apps/traincascade/haarfeatures.cpp @@ -25,9 +25,9 @@ void CvHaarFeatureParams::init( const CvFeatureParams& fp ) void CvHaarFeatureParams::write( FileStorage &fs ) const { CvFeatureParams::write( fs ); - String modeStr = mode == BASIC ? CC_MODE_BASIC : + string modeStr = mode == BASIC ? CC_MODE_BASIC : mode == CORE ? CC_MODE_CORE : - mode == ALL ? CC_MODE_ALL : String(); + mode == ALL ? CC_MODE_ALL : string(); CV_Assert( !modeStr.empty() ); fs << CC_MODE << modeStr; } @@ -40,7 +40,7 @@ bool CvHaarFeatureParams::read( const FileNode &node ) FileNode rnode = node[CC_MODE]; if( !rnode.isString() ) return false; - String modeStr; + string modeStr; rnode >> modeStr; mode = !modeStr.compare( CC_MODE_BASIC ) ? BASIC : !modeStr.compare( CC_MODE_CORE ) ? CORE : @@ -58,13 +58,13 @@ void CvHaarFeatureParams::printDefaults() const void CvHaarFeatureParams::printAttrs() const { CvFeatureParams::printAttrs(); - String mode_str = mode == BASIC ? CC_MODE_BASIC : + string mode_str = mode == BASIC ? CC_MODE_BASIC : mode == CORE ? CC_MODE_CORE : mode == ALL ? CC_MODE_ALL : 0; cout << "mode: " << mode_str << endl; } -bool CvHaarFeatureParams::scanAttr( const String prmName, const String val) +bool CvHaarFeatureParams::scanAttr( const string prmName, const string val) { if ( !CvFeatureParams::scanAttr( prmName, val ) ) { diff --git a/apps/traincascade/haarfeatures.h b/apps/traincascade/haarfeatures.h index 64739027a..472822bb8 100644 --- a/apps/traincascade/haarfeatures.h +++ b/apps/traincascade/haarfeatures.h @@ -23,7 +23,7 @@ public: virtual void printDefaults() const; virtual void printAttrs() const; - virtual bool scanAttr( const String prm, const String val); + virtual bool scanAttr( const std::string prm, const std::string val); int mode; }; @@ -64,7 +64,7 @@ protected: } fastRect[CV_HAAR_FEATURE_MAX]; }; - vector features; + std::vector features; Mat sum; /* sum images (each row represents image) */ Mat tilted; /* tilted sum images (each row represents image) */ Mat normfactor; /* normalization factor */ diff --git a/apps/traincascade/imagestorage.cpp b/apps/traincascade/imagestorage.cpp index 0f749f9b0..9faf84aa0 100644 --- a/apps/traincascade/imagestorage.cpp +++ b/apps/traincascade/imagestorage.cpp @@ -7,7 +7,9 @@ #include #include -bool CvCascadeImageReader::create( const String _posFilename, const String _negFilename, Size _winSize ) +using namespace std; + +bool CvCascadeImageReader::create( const string _posFilename, const string _negFilename, Size _winSize ) { return posReader.create(_posFilename) && negReader.create(_negFilename, _winSize); } @@ -22,21 +24,21 @@ CvCascadeImageReader::NegReader::NegReader() stepFactor = 0.5F; } -bool CvCascadeImageReader::NegReader::create( const String _filename, Size _winSize ) +bool CvCascadeImageReader::NegReader::create( const string _filename, Size _winSize ) { - String dirname, str; + string dirname, str; std::ifstream file(_filename.c_str()); if ( !file.is_open() ) return false; size_t pos = _filename.rfind('\\'); char dlmrt = '\\'; - if (pos == String::npos) + if (pos == string::npos) { pos = _filename.rfind('/'); dlmrt = '/'; } - dirname = pos == String::npos ? "" : _filename.substr(0, pos) + dlmrt; + dirname = pos == string::npos ? "" : _filename.substr(0, pos) + dlmrt; while( !file.eof() ) { std::getline(file, str); @@ -64,8 +66,8 @@ bool CvCascadeImageReader::NegReader::nextImg() round = round % (winSize.width * winSize.height); last %= count; - _offset.x = min( (int)round % winSize.width, src.cols - winSize.width ); - _offset.y = min( (int)round / winSize.width, src.rows - winSize.height ); + _offset.x = std::min( (int)round % winSize.width, src.cols - winSize.width ); + _offset.y = std::min( (int)round / winSize.width, src.rows - winSize.height ); if( !src.empty() && src.type() == CV_8UC1 && offset.x >= 0 && offset.y >= 0 ) break; @@ -126,7 +128,7 @@ CvCascadeImageReader::PosReader::PosReader() vec = 0; } -bool CvCascadeImageReader::PosReader::create( const String _filename ) +bool CvCascadeImageReader::PosReader::create( const string _filename ) { if ( file ) fclose( file ); diff --git a/apps/traincascade/imagestorage.h b/apps/traincascade/imagestorage.h index 91a4e5e87..dd08e664d 100644 --- a/apps/traincascade/imagestorage.h +++ b/apps/traincascade/imagestorage.h @@ -8,7 +8,7 @@ using namespace cv; class CvCascadeImageReader { public: - bool create( const String _posFilename, const String _negFilename, Size _winSize ); + bool create( const std::string _posFilename, const std::string _negFilename, Size _winSize ); void restart() { posReader.restart(); } bool getNeg(Mat &_img) { return negReader.get( _img ); } bool getPos(Mat &_img) { return posReader.get( _img ); } @@ -19,7 +19,7 @@ private: public: PosReader(); virtual ~PosReader(); - bool create( const String _filename ); + bool create( const std::string _filename ); bool get( Mat &_img ); void restart(); @@ -35,12 +35,12 @@ private: { public: NegReader(); - bool create( const String _filename, Size _winSize ); + bool create( const std::string _filename, Size _winSize ); bool get( Mat& _img ); bool nextImg(); Mat src, img; - vector imgFilenames; + std::vector imgFilenames; Point offset, point; float scale; float scaleFactor; diff --git a/apps/traincascade/lbpfeatures.h b/apps/traincascade/lbpfeatures.h index 30c35374d..d4397c442 100644 --- a/apps/traincascade/lbpfeatures.h +++ b/apps/traincascade/lbpfeatures.h @@ -34,7 +34,7 @@ protected: Rect rect; int p[16]; }; - vector features; + std::vector features; Mat sum; }; diff --git a/apps/traincascade/traincascade.cpp b/apps/traincascade/traincascade.cpp index 5a969f434..dfb49b507 100644 --- a/apps/traincascade/traincascade.cpp +++ b/apps/traincascade/traincascade.cpp @@ -9,7 +9,7 @@ using namespace std; int main( int argc, char* argv[] ) { CvCascadeClassifier classifier; - String cascadeDirName, vecName, bgName; + string cascadeDirName, vecName, bgName; int numPos = 2000; int numNeg = 1000; int numStages = 20; diff --git a/apps/traincascade/traincascade_features.h b/apps/traincascade/traincascade_features.h index 019a4b9b3..dde0f1a7f 100644 --- a/apps/traincascade/traincascade_features.h +++ b/apps/traincascade/traincascade_features.h @@ -33,7 +33,7 @@ float calcNormFactor( const Mat& sum, const Mat& sqSum ); template -void _writeFeatures( const vector features, FileStorage &fs, const Mat& featureMap ) +void _writeFeatures( const std::vector features, FileStorage &fs, const Mat& featureMap ) { fs << FEATURES << "["; const Mat_& featureMap_ = (const Mat_&)featureMap; @@ -58,8 +58,8 @@ public: // from|to screen virtual void printDefaults() const; virtual void printAttrs() const; - virtual bool scanAttr( const String prmName, const String val ); - String name; + virtual bool scanAttr( const std::string prmName, const std::string val ); + std::string name; }; class CvFeatureParams : public CvParams