Commit b80bdf32 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

two small fixes in the recently added stuff

parent 318b0f10
...@@ -1370,7 +1370,7 @@ int CvTS::run( int argc, char** argv, const char** blacklist ) ...@@ -1370,7 +1370,7 @@ int CvTS::run( int argc, char** argv, const char** blacklist )
if( datapath_dir ) if( datapath_dir )
{ {
sprintf( buf, "%s/%s", datapath_dir, module_name ? module_name : "" ); sprintf( buf, "%s/%s", datapath_dir, module_name ? module_name : "" );
printf( LOG + CONSOLE + SUMMARY, "Data Path = %s\n", buf); printf( LOG + SUMMARY, "Data Path = %s\n", buf);
set_data_path(buf); set_data_path(buf);
} }
} }
...@@ -1949,8 +1949,9 @@ int CvTS::filter( CvTest* test, int& filter_state, const char** blacklist ) ...@@ -1949,8 +1949,9 @@ int CvTS::filter( CvTest* test, int& filter_state, const char** blacklist )
filter_state = 1; filter_state = 1;
return inverse; return inverse;
} }
if( greater_or_equal == 2 ) else
{ {
assert(filter_state == 2);
filter_state = 1; filter_state = 1;
return inverse ^ 1; return inverse ^ 1;
} }
......
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