Commit 9702b5ef authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

made the samples compile on Windows

parent 9ca45dab
...@@ -583,7 +583,7 @@ protected: ...@@ -583,7 +583,7 @@ protected:
class CV_EXPORTS DOTDetector class CV_EXPORTS DOTDetector
{ {
public: public:
struct TrainParams struct CV_EXPORTS TrainParams
{ {
enum { BIN_COUNT = 7 }; enum { BIN_COUNT = 7 };
static double BIN_RANGE() { return 180.0 / BIN_COUNT; } static double BIN_RANGE() { return 180.0 / BIN_COUNT; }
...@@ -608,7 +608,7 @@ public: ...@@ -608,7 +608,7 @@ public:
float minRatio; float minRatio;
}; };
struct DetectParams struct CV_EXPORTS DetectParams
{ {
DetectParams(); DetectParams();
DetectParams( float minRatio, int minRegionSize, int maxRegionSize, int regionSizeStep, DetectParams( float minRatio, int minRegionSize, int maxRegionSize, int regionSizeStep,
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#include "opencv2/ml/ml.hpp" #include "opencv2/ml/ml.hpp"
#include <cstdio> #include <cstdio>
#include <vector>
/* /*
*/ */
...@@ -667,9 +668,9 @@ int build_svm_classifier( char* data_filename ) ...@@ -667,9 +668,9 @@ int build_svm_classifier( char* data_filename )
svm.train(&train_data, train_resp, 0, 0, param); svm.train(&train_data, train_resp, 0, 0, param);
// classification // classification
float _sample[var_count * (nsamples_all - ntrain_samples)]; std::vector<float> _sample(var_count * (nsamples_all - ntrain_samples));
CvMat sample = cvMat( nsamples_all - ntrain_samples, 16, CV_32FC1, _sample ); CvMat sample = cvMat( nsamples_all - ntrain_samples, 16, CV_32FC1, &_sample[0] );
float true_results[nsamples_all - ntrain_samples]; std::vector<float> true_results(nsamples_all - ntrain_samples);
for (int j = ntrain_samples; j < nsamples_all; j++) for (int j = ntrain_samples; j < nsamples_all; j++)
{ {
float *s = data->data.fl + j * var_count; float *s = data->data.fl + j * var_count;
...@@ -683,7 +684,7 @@ int build_svm_classifier( char* data_filename ) ...@@ -683,7 +684,7 @@ int build_svm_classifier( char* data_filename )
CvMat *result = cvCreateMat(1, nsamples_all - ntrain_samples, CV_32FC1); CvMat *result = cvCreateMat(1, nsamples_all - ntrain_samples, CV_32FC1);
printf("Classification (may take a few minutes)...\n"); printf("Classification (may take a few minutes)...\n");
(int)svm.predict(&sample, result); svm.predict(&sample, result);
int true_resp = 0; int true_resp = 0;
for (int i = 0; i < nsamples_all - ntrain_samples; i++) for (int i = 0; i < nsamples_all - ntrain_samples; i++)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment