generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drop cv:: prefix from cv::String used inside the cv namespace

Browse Source
This commit is contained in:
Andrey Kamaev
2013-03-22 20:37:49 +04:00
parent 75513a46dc
commit be7bbe3aa9
122 changed files with 1077 additions and 1077 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/softcascade/include/opencv2/softcascade.hpp
View File

@@ -109,7 +109,7 @@ public:
float operator() (const cv::Mat& integrals, const cv::Size& model) const;
friend void write(cv::FileStorage& fs, const cv::String&, const ChannelFeature& f);
friend void write(cv::FileStorage& fs, const String&, const ChannelFeature& f);
friend std::ostream& operator<<(std::ostream& out, const ChannelFeature& f);
private:
@@ -117,7 +117,7 @@ private:
int channel;
};
void write(cv::FileStorage& fs, const cv::String&, const ChannelFeature& f);
void write(cv::FileStorage& fs, const String&, const ChannelFeature& f);
std::ostream& operator<<(std::ostream& out, const ChannelFeature& m);
// ========================================================================== //
@@ -135,7 +135,7 @@ public:
CV_WRAP virtual int totalChannels() const = 0;
virtual cv::AlgorithmInfo* info() const = 0;
CV_WRAP static cv::Ptr<ChannelFeatureBuilder> create(const cv::String& featureType);
CV_WRAP static cv::Ptr<ChannelFeatureBuilder> create(const String& featureType);
};
// ========================================================================== //
@@ -211,7 +211,7 @@ public:
virtual bool train(const Dataset* dataset, const FeaturePool* pool, int weaks, int treeDepth) = 0;
virtual void setRejectThresholds(OutputArray thresholds) = 0;
virtual void write( cv::FileStorage &fs, const FeaturePool* pool, InputArray thresholds) const = 0;
virtual void write( CvFileStorage* fs, cv::String name) const = 0;
virtual void write( CvFileStorage* fs, String name) const = 0;
};
CV_EXPORTS bool initModule_softcascade(void);

8
modules/softcascade/src/detector.cpp
View File

@@ -240,7 +240,7 @@ struct cv::softcascade::Detector::Fields
typedef std::vector<SOctave>::iterator octIt_t;
typedef std::vector<Detection> dvector;
cv::String featureTypeStr;
String featureTypeStr;
void detectAt(const int dx, const int dy, const Level& level, const ChannelStorage& storage, dvector& detections) const
{
@@ -364,14 +364,14 @@ struct cv::softcascade::Detector::Fields
static const char *const FEATURE_FORMAT = "featureFormat";
// only Ada Boost supported
cv::String stageTypeStr = (cv::String)root[SC_STAGE_TYPE];
String stageTypeStr = (String)root[SC_STAGE_TYPE];
CV_Assert(stageTypeStr == SC_BOOST);
cv::String fformat = (cv::String)root[FEATURE_FORMAT];
String fformat = (String)root[FEATURE_FORMAT];
bool useBoxes = (fformat == "BOX");
// only HOG-like integral channel features supported
featureTypeStr = (cv::String)root[SC_FEATURE_TYPE];
featureTypeStr = (String)root[SC_FEATURE_TYPE];
CV_Assert(featureTypeStr == SC_ICF || featureTypeStr == SC_HOG6_MAG_LUV);
origObjWidth = (int)root[SC_ORIG_W];

6
modules/softcascade/src/detector_cuda.cpp
View File

@@ -136,17 +136,17 @@ struct cv::softcascade::SCascade::Fields
static const char *const SC_F_RECT = "rect";
// only Ada Boost supported
cv::String stageTypeStr = (cv::String)root[SC_STAGE_TYPE];
String stageTypeStr = (String)root[SC_STAGE_TYPE];
CV_Assert(stageTypeStr == SC_BOOST);
// only HOG-like integral channel features supported
cv::String featureTypeStr = (cv::String)root[SC_FEATURE_TYPE];
String featureTypeStr = (String)root[SC_FEATURE_TYPE];
CV_Assert(featureTypeStr == SC_ICF);
int origWidth = (int)root[SC_ORIG_W];
int origHeight = (int)root[SC_ORIG_H];
cv::String fformat = (cv::String)root[SC_FEATURE_FORMAT];
String fformat = (String)root[SC_FEATURE_FORMAT];
bool useBoxes = (fformat == "BOX");
ushort shrinkage = cv::saturate_cast<ushort>((int)root[SC_SHRINKAGE]);