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/select3dobj.cpp
+++ b/samples/cpp/select3dobj.cpp
@@ -491,7 +491,8 @@ int main(int argc, char** argv)
        if( outbarename )
        {
            cmd[6 + outbarename - outprefix] = '\0';
-            system(cmd);
+            int result = system(cmd);
+            CV_Assert(result == 0);
            outbarename++;
        }
        else