mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-24 03:00:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

1) make sure Python 2.7 is detected on Ubuntu (including libs) when it's there.

Browse Source 
2) disable IPP on 32-bit Linux when OpenCV is built as shared libs. Otherwise we get linker errors
3) disable IPP's minMaxIdx 32-bit floating-point flavor in a hope that it fixes some test failures
This commit is contained in:
Vadim Pisarevsky 2015-03-05 18:58:54 +03:00
parent 0b99f6bcd6
commit 7a52c3d9f1
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -995,7 +995,7 @@ if(WITH_IPP AND HAVE_IPP)
status(" linked:" BUILD_WITH_DYNAMIC_IPP THEN "dynamic" ELSE "static")
endif()
else()
status(" Use IPP:" WITH_IPP AND NOT HAVE_IPP THEN "IPP not found" ELSE NO)
status(" Use IPP:" WITH_IPP AND NOT HAVE_IPP THEN "IPP not found or implicitly disabled" ELSE NO)
endif()
if(DEFINED WITH_IPP_A)

3
cmake/OpenCVDetectPython.cmake
View File

@ -88,6 +88,9 @@ function(find_python preferred_version min_version library_env include_dir_env
find_host_package(PythonLibs "${_version_major_minor}")
else()
find_host_package(PythonLibs "${_version_major_minor}.${_version_patch}" EXACT)
if(NOT PYTHONLIBS_FOUND)
find_host_package(PythonLibs "${_version_major_minor}.${_version_patch}")
endif()
endif()
if(PYTHONLIBS_FOUND)

5
cmake/OpenCVFindIPP.cmake
View File

@ -34,6 +34,11 @@ unset(IPP_VERSION_MAJOR)
unset(IPP_VERSION_MINOR)
unset(IPP_VERSION_BUILD)
if (X86 AND UNIX AND NOT APPLE AND NOT ANDROID AND BUILD_SHARED_LIBS)
message(STATUS "On 32-bit Linux IPP can not currently be used with dynamic libs. Set BUILD_SHARED_LIBS=OFF")
return()
endif()
set(IPP_X64 0)
if(CMAKE_CXX_SIZEOF_DATA_PTR EQUAL 8)
set(IPP_X64 1)

2
modules/core/src/stat.cpp
View File

@ -2314,7 +2314,7 @@ void cv::minMaxIdx(InputArray _src, double* minVal,
depth == CV_8U ? (ippiMinMaxIndxFuncC1)ippiMinMaxIndx_8u_C1R :
depth == CV_8S ? (ippiMinMaxIndxFuncC1)ippiMinMaxIndx_8s_C1R :
depth == CV_16U ? (ippiMinMaxIndxFuncC1)ippiMinMaxIndx_16u_C1R :
depth == CV_32F ? (ippiMinMaxIndxFuncC1)ippiMinMaxIndx_32f_C1R : 0;
/*depth == CV_32F ? (ippiMinMaxIndxFuncC1)ippiMinMaxIndx_32f_C1R :*/ 0;
CV_SUPPRESS_DEPRECATED_END
if( ippFuncC1 )