From 22b165ca9f92829390c981ba4b593528a93a15f3 Mon Sep 17 00:00:00 2001 From: Vlad Shakhuro Date: Thu, 22 May 2014 23:59:59 +0400 Subject: [PATCH] Use cv::Point instead of ACFFeature --- .../adas/include/opencv2/adas/acffeature.hpp | 27 +++---------------- 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/modules/adas/include/opencv2/adas/acffeature.hpp b/modules/adas/include/opencv2/adas/acffeature.hpp index 314a45a76..f570a5e9f 100644 --- a/modules/adas/include/opencv2/adas/acffeature.hpp +++ b/modules/adas/include/opencv2/adas/acffeature.hpp @@ -47,27 +47,6 @@ namespace cv namespace adas { -class ACFFeature -{ -public: - /* Initialize feature with zero row and col */ - ACFFeature(); - - /* Initialize feature with given row and col */ - ACFFeature(int row, int col); - -private: - /* Feature row */ - int row_; - /* Feature col */ - int col_; -}; - -/* Save ACFFeature to FileStorage */ -FileStorage& operator<< (FileStorage& out, const ACFFeature& feature); -/* Load ACFFeature from FileStorage */ -FileStorage& operator>> (FileStorage& in, ACFFeature& feature); - /* Compute channel pyramid for acf features image — image, for which pyramid should be computed @@ -85,7 +64,7 @@ class ACFFeatureEvaluator { public: /* Construct evaluator, set features to evaluate */ - ACFFeatureEvaluator(const std::vector& features); + ACFFeatureEvaluator(const std::vector& features); /* Set channels for feature evaluation */ void setChannels(const std::vector>& channels); @@ -105,7 +84,7 @@ public: private: /* Features to evaluate */ - std::vector features_; + std::vector features_; /* Channels for feature evaluation */ std::vector> channels /* Channels window position */ @@ -123,7 +102,7 @@ private: Returns vector of distinct acf features */ -std::vector +std::vector generateFeatures(Size window_size, size_t count = UINT_MAX, int seed = 0); } /* namespace adas */