generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Warning on converting int to bool fixed

Browse Source
This commit is contained in:
Grigory Serebryakov
2014-09-05 11:27:43 +04:00
parent 06a1c90679
commit 18c0511d3c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/haartraining/createsamples.cpp
View File

@@ -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[] )
} }
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;

4
apps/haartraining/cvhaartraining.cpp
View File

@@ -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,
cvShowImage( "Sample", &sample ); cvShowImage( "Sample", &sample );
if( cvWaitKey( 0 ) == 27 ) if( cvWaitKey( 0 ) == 27 )
{ {
showsamples = 0; showsamples = false;
} }
} }

2
apps/haartraining/cvhaartraining.h
View File

@@ -86,7 +86,7 @@ void cvCreateTrainingSamples( const char* filename,
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,