generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #85 from Nerei/master

Browse Source
This commit is contained in:
Andrey Kamaev 2012-10-23 20:47:56 +04:00
commit f14a711bda
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/OpenCVFindLibsPerf.cmake
View File

@ -32,7 +32,7 @@ endif(WITH_CUDA)
# --- Eigen --- # --- Eigen ---
if(WITH_EIGEN) if(WITH_EIGEN)
find_path(EIGEN_INCLUDE_PATH "Eigen/Core" find_path(EIGEN_INCLUDE_PATH "Eigen/Core"
PATHS /usr/local /opt /usr ENV ProgramFiles ENV ProgramW6432 PATHS /usr/local /opt /usr $ENV{EIGEN_ROOT}/include ENV ProgramFiles ENV ProgramW6432
PATH_SUFFIXES include/eigen3 include/eigen2 Eigen/include/eigen3 Eigen/include/eigen2 PATH_SUFFIXES include/eigen3 include/eigen2 Eigen/include/eigen3 Eigen/include/eigen2
DOC "The path to Eigen3/Eigen2 headers" DOC "The path to Eigen3/Eigen2 headers"
CMAKE_FIND_ROOT_PATH_BOTH) CMAKE_FIND_ROOT_PATH_BOTH)

1
modules/core/src/parallel.cpp
View File

@ -322,6 +322,7 @@ int cv::getNumThreads(void)
void cv::setNumThreads( int threads ) void cv::setNumThreads( int threads )
{ {
(void)threads;
#ifdef HAVE_PARALLEL_FRAMEWORK #ifdef HAVE_PARALLEL_FRAMEWORK
numThreads = threads; numThreads = threads;
#endif #endif