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

code cleaning of cascade classifier

Browse Source
This commit is contained in:
Kirill Kornyakov
2010-12-09 15:09:34 +00:00
parent 33c44fcd7a
commit d8415ed44e
3 changed files with 88 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/objdetect/src/haar.cpp
View File

@@ -112,7 +112,7 @@ CvHidHaarStageClassifier;
struct CvHidHaarClassifierCascade
{
int count;
int is_stump_based;
int isStumpBased;
int has_tilted_features;
int is_tree;
double inv_window_area;
@@ -272,7 +272,7 @@ icvCreateHidHaarClassifierCascade( CvHaarClassifierCascade* cascade )
haar_classifier_ptr = (CvHidHaarClassifier*)(out->stage_classifier + cascade->count);
haar_node_ptr = (CvHidHaarTreeNode*)(haar_classifier_ptr + total_classifiers);
out->is_stump_based = 1;
out->isStumpBased = 1;
out->has_tilted_features = has_tilted_features;
out->is_tree = 0;
@@ -329,12 +329,12 @@ icvCreateHidHaarClassifierCascade( CvHaarClassifierCascade* cascade )
haar_node_ptr =
(CvHidHaarTreeNode*)cvAlignPtr(alpha_ptr+node_count+1, sizeof(void*));
out->is_stump_based &= node_count == 1;
out->isStumpBased &= node_count == 1;
}
}
#ifdef HAVE_IPP
int can_use_ipp = !out->has_tilted_features && !out->is_tree && out->is_stump_based;
int can_use_ipp = !out->has_tilted_features && !out->is_tree && out->isStumpBased;
if( can_use_ipp )
{
@@ -719,7 +719,7 @@ cvRunHaarClassifierCascade( const CvHaarClassifierCascade* _cascade,
}
}
}
else if( cascade->is_stump_based )
else if( cascade->isStumpBased )
{
for( i = start_stage; i < cascade->count; i++ )
{