diff --git a/apps/haartraining/createsamples.cpp b/apps/haartraining/createsamples.cpp index a1a11e0b5..4d01fbd10 100644 --- a/apps/haartraining/createsamples.cpp +++ b/apps/haartraining/createsamples.cpp @@ -73,7 +73,7 @@ int main( int argc, char* argv[] ) double maxxangle = 1.1; double maxyangle = 1.1; double maxzangle = 0.5; - int showsamples = 0; + bool showsamples = false; /* the samples are adjusted to this scale in the sample preview window */ double scale = 4.0; int width = 24; @@ -159,7 +159,7 @@ int main( int argc, char* argv[] ) } else if( !strcmp( argv[i], "-show" ) ) { - showsamples = 1; + showsamples = true; if( i+1 < argc && strlen( argv[i+1] ) > 0 && argv[i+1][0] != '-' ) { double d; diff --git a/apps/haartraining/cvhaartraining.cpp b/apps/haartraining/cvhaartraining.cpp index 31abfff6d..ed2684813 100644 --- a/apps/haartraining/cvhaartraining.cpp +++ b/apps/haartraining/cvhaartraining.cpp @@ -2848,7 +2848,7 @@ void cvCreateTrainingSamples( const char* filename, const char* bgfilename, int count, int invert, int maxintensitydev, double maxxangle, double maxyangle, double maxzangle, - int showsamples, + bool showsamples, int winwidth, int winheight ) { CvSampleDistortionData data; @@ -2915,7 +2915,7 @@ void cvCreateTrainingSamples( const char* filename, cvShowImage( "Sample", &sample ); if( cvWaitKey( 0 ) == 27 ) { - showsamples = 0; + showsamples = false; } } diff --git a/apps/haartraining/cvhaartraining.h b/apps/haartraining/cvhaartraining.h index 84a5643e7..038e1cc35 100644 --- a/apps/haartraining/cvhaartraining.h +++ b/apps/haartraining/cvhaartraining.h @@ -79,14 +79,14 @@ struct CvMat; */ #define CV_RANDOM_INVERT 0x7FFFFFFF -void cvCreateTrainingSamples( const char* filename, +void cvCreateTrainingSamples(const char* filename, const char* imgfilename, int bgcolor, int bgthreshold, const char* bgfilename, int count, int invert = 0, int maxintensitydev = 40, double maxxangle = 1.1, double maxyangle = 1.1, double maxzangle = 0.5, - int showsamples = 0, + bool showsamples = false, int winwidth = 24, int winheight = 24 ); void cvCreatePngTrainingSet(const char* imgfilename, int bgcolor, int bgthreshold,