Merged the trunk r8589:8653 - all changes related to build warnings

2012-06-15 13:04:17 +00:00
parent 73c152abc4
commit bd0e0b5800
438 changed files with 20374 additions and 19674 deletions
--- a/modules/objdetect/src/latentsvmdetector.cpp
+++ b/modules/objdetect/src/latentsvmdetector.cpp
@@ -192,7 +192,7 @@ size_t LatentSvmDetector::getClassCount() const
    return classNames.size();
 }

-string extractModelName( const string& filename )
+static string extractModelName( const string& filename )
 {
    size_t startPos = filename.rfind('/');
    if( startPos == string::npos )