Commit 18c0511d authored by Grigory Serebryakov's avatar Grigory Serebryakov

Warning on converting int to bool fixed

parent 06a1c906
...@@ -73,7 +73,7 @@ int main( int argc, char* argv[] ) ...@@ -73,7 +73,7 @@ int main( int argc, char* argv[] )
double maxxangle = 1.1; double maxxangle = 1.1;
double maxyangle = 1.1; double maxyangle = 1.1;
double maxzangle = 0.5; double maxzangle = 0.5;
int showsamples = 0; bool showsamples = false;
/* the samples are adjusted to this scale in the sample preview window */ /* the samples are adjusted to this scale in the sample preview window */
double scale = 4.0; double scale = 4.0;
int width = 24; int width = 24;
...@@ -159,7 +159,7 @@ int main( int argc, char* argv[] ) ...@@ -159,7 +159,7 @@ int main( int argc, char* argv[] )
} }
else if( !strcmp( argv[i], "-show" ) ) else if( !strcmp( argv[i], "-show" ) )
{ {
showsamples = 1; showsamples = true;
if( i+1 < argc && strlen( argv[i+1] ) > 0 && argv[i+1][0] != '-' ) if( i+1 < argc && strlen( argv[i+1] ) > 0 && argv[i+1][0] != '-' )
{ {
double d; double d;
......
...@@ -2848,7 +2848,7 @@ void cvCreateTrainingSamples( const char* filename, ...@@ -2848,7 +2848,7 @@ void cvCreateTrainingSamples( const char* filename,
const char* bgfilename, int count, const char* bgfilename, int count,
int invert, int maxintensitydev, int invert, int maxintensitydev,
double maxxangle, double maxyangle, double maxzangle, double maxxangle, double maxyangle, double maxzangle,
int showsamples, bool showsamples,
int winwidth, int winheight ) int winwidth, int winheight )
{ {
CvSampleDistortionData data; CvSampleDistortionData data;
...@@ -2915,7 +2915,7 @@ void cvCreateTrainingSamples( const char* filename, ...@@ -2915,7 +2915,7 @@ void cvCreateTrainingSamples( const char* filename,
cvShowImage( "Sample", &sample ); cvShowImage( "Sample", &sample );
if( cvWaitKey( 0 ) == 27 ) if( cvWaitKey( 0 ) == 27 )
{ {
showsamples = 0; showsamples = false;
} }
} }
......
...@@ -79,14 +79,14 @@ struct CvMat; ...@@ -79,14 +79,14 @@ struct CvMat;
*/ */
#define CV_RANDOM_INVERT 0x7FFFFFFF #define CV_RANDOM_INVERT 0x7FFFFFFF
void cvCreateTrainingSamples( const char* filename, void cvCreateTrainingSamples(const char* filename,
const char* imgfilename, int bgcolor, int bgthreshold, const char* imgfilename, int bgcolor, int bgthreshold,
const char* bgfilename, int count, const char* bgfilename, int count,
int invert = 0, int maxintensitydev = 40, int invert = 0, int maxintensitydev = 40,
double maxxangle = 1.1, double maxxangle = 1.1,
double maxyangle = 1.1, double maxyangle = 1.1,
double maxzangle = 0.5, double maxzangle = 0.5,
int showsamples = 0, bool showsamples = false,
int winwidth = 24, int winheight = 24 ); int winwidth = 24, int winheight = 24 );
void cvCreatePngTrainingSet(const char* imgfilename, int bgcolor, int bgthreshold, void cvCreatePngTrainingSet(const char* imgfilename, int bgcolor, int bgthreshold,
......
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