Merge pull request #85 from Nerei/master

2012-10-23 20:47:56 +04:00
parent 91f47d2779 d681717702
commit f14a711bda
2 changed files with 2 additions and 1 deletions
--- a/modules/core/src/parallel.cpp
+++ b/modules/core/src/parallel.cpp
@@ -322,6 +322,7 @@ int cv::getNumThreads(void)

 void cv::setNumThreads( int threads )
 {
+    (void)threads;
 #ifdef HAVE_PARALLEL_FRAMEWORK
    numThreads = threads;
 #endif