1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00

code review fixes

This commit is contained in:
marina.kolpakova
2013-01-31 19:17:56 +04:00
parent 14ac8a528e
commit f7ac73998a
13 changed files with 73 additions and 74 deletions
+3 -3
View File
@@ -58,7 +58,7 @@ using namespace std;
namespace {
typedef vector<string> svector;
class ScaledDataset : public cv::Dataset
class ScaledDataset : public cv::scascade::Dataset
{
public:
ScaledDataset(const string& path, const int octave);
@@ -210,7 +210,7 @@ TEST(DISABLED_SoftCascade, training)
float octave = powf(2.f, (float)(*it));
cv::Size model = cv::Size( cvRound(64 * octave) / shrinkage, cvRound(128 * octave) / shrinkage );
cv::Ptr<cv::FeaturePool> pool = cv::FeaturePool::create(model, nfeatures);
cv::Ptr<cv::scascade::FeaturePool> pool = cv::scascade::FeaturePool::create(model, nfeatures);
nfeatures = pool->size();
int npositives = 20;
int nnegatives = 40;
@@ -218,7 +218,7 @@ TEST(DISABLED_SoftCascade, training)
cv::Rect boundingBox = cv::Rect( cvRound(20 * octave), cvRound(20 * octave),
cvRound(64 * octave), cvRound(128 * octave));
typedef cv::SoftCascadeOctave Octave;
typedef cv::scascade::SoftCascadeOctave Octave;
cv::Ptr<Octave> boost = Octave::create(boundingBox, npositives, nnegatives, *it, shrinkage, nfeatures);
std::string path = cvtest::TS::ptr()->get_data_path() + "softcascade/sample_training_set";