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/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]);