Change namespace to xobjdetect

modules/adas/tools/fcw_train.cpp

@@ -19,10 +19,10 @@ using cv::Rect;
 
 #include <opencv2/xobjdetect.hpp>
 
-using cv::adas::ICFDetectorParams;
-using cv::adas::ICFDetector;
-using cv::adas::WaldBoost;
-using cv::adas::WaldBoostParams;
+using cv::xobjdetect::ICFDetectorParams;
+using cv::xobjdetect::ICFDetector;
+using cv::xobjdetect::WaldBoost;
+using cv::xobjdetect::WaldBoostParams;
 using cv::Mat;
 
 static bool read_pos_int(const char *str, int *n)

modules/xobjdetect/include/opencv2/xobjdetect.hpp

@@ -48,7 +48,7 @@ the use of this software, even if advised of the possibility of such damage.
 
 namespace cv
 {
-namespace adas
+namespace xobjdetect
 {
 
 /* Compute channel pyramid for acf features
@@ -227,7 +227,7 @@ public:
     bool save(const std::string& filename);
 };
 
-} /* namespace adas */
+} /* namespace xobjdetect */
 } /* namespace cv */
 
 

modules/xobjdetect/src/acffeature.cpp

@@ -53,7 +53,7 @@ using std::min;
 
 namespace cv
 {
-namespace adas
+namespace xobjdetect
 {
 
 ACFFeatureEvaluator::ACFFeatureEvaluator(const vector<Point3i>& features):
@@ -176,5 +176,5 @@ void computeChannels(cv::InputArray image, cv::OutputArrayOfArrays channels_)
     channels_.setTo(channels);
 }
 
-} /* namespace adas */
+} /* namespace xobjdetect */
 } /* namespace cv */

modules/xobjdetect/src/icfdetector.cpp

@@ -61,7 +61,7 @@ using std::max;
 
 namespace cv
 {
-namespace adas
+namespace xobjdetect
 {
 
 static bool overlap(const Rect& r, const vector<Rect>& gt)
@@ -158,5 +158,5 @@ bool ICFDetector::save(const string& filename)
     return true;
 }
 
-} /* namespace adas */
+} /* namespace xobjdetect */
 } /* namespace cv */

modules/xobjdetect/src/stump.cpp

@@ -45,7 +45,7 @@ the use of this software, even if advised of the possibility of such damage.
 
 namespace cv
 {
-namespace adas
+namespace xobjdetect
 {
 
 /* Cumulative sum by rows */
@@ -201,5 +201,5 @@ float Stump::predict(int value) const
     return polarity_ * (value - threshold_) > 0 ? pos_value_ : neg_value_;
 }
 
-} /* namespace adas */
+} /* namespace xobjdetect */
 } /* namespace cv */

modules/xobjdetect/src/waldboost.cpp

@@ -52,7 +52,7 @@ using std::vector;
 
 namespace cv
 {
-namespace adas
+namespace xobjdetect
 {
 
 WaldBoost::WaldBoost(const WaldBoostParams& params): params_(params)
@@ -161,5 +161,5 @@ float WaldBoost::predict(const Ptr<ACFFeatureEvaluator>& feature_evaluator)
     return trace;
 }
 
-} /* namespace adas */
+} /* namespace xobjdetect */
 } /* namespace cv */