merged all the latest changes from 2.4 to trunk

2012-04-13 21:50:59 +00:00
parent 020f9a6047
commit 2fd1e2ea57
416 changed files with 12852 additions and 6070 deletions
--- a/samples/cpp/detector_descriptor_matcher_evaluation.cpp
+++ b/samples/cpp/detector_descriptor_matcher_evaluation.cpp
@@ -273,7 +273,8 @@ int main(int argc, char** argv)
    if( dir[dir.size()-1] != '\\' && dir[dir.size()-1] != '/' )
        dir += "/";
    
-    system(("mkdir " + dir).c_str());
+    int result = system(("mkdir " + dir).c_str());
+    CV_Assert(result == 0);
    
    for( int i = 0; ddms[i*4] != 0; i++ )
    {