merged the trunk r8704:8716

2012-06-28 16:13:29 +00:00
parent 2777ebb8a0
commit 680a44189c
83 changed files with 2402 additions and 2052 deletions
--- a/samples/gpu/opticalflow_nvidia_api.cpp
+++ b/samples/gpu/opticalflow_nvidia_api.cpp
@@ -20,7 +20,7 @@
 #endif

 #if !defined(HAVE_CUDA)
-int main( int argc, const char** argv )
+int main( int, const char** )
 {
    std::cout << "Please compile the library with CUDA support" << std::endl;
    return -1;