mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-01 06:49:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3794 from vpisarev:ubuntu_x86_fixes

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-03-09 21:34:17 +00:00
commit 64bd77cf4d
4 changed files with 12 additions and 4 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") status(" linked:" BUILD_WITH_DYNAMIC_IPP THEN "dynamic" ELSE "static")
endif() endif()
else() 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() endif()
if(DEFINED WITH_IPP_A) if(DEFINED WITH_IPP_A)

4
cmake/OpenCVDetectPython.cmake
View File

@ -75,10 +75,10 @@ function(find_python preferred_version min_version library_env include_dir_env
if(NOT ANDROID AND NOT IOS) if(NOT ANDROID AND NOT IOS)
ocv_check_environment_variables(${library_env} ${include_dir_env}) ocv_check_environment_variables(${library_env} ${include_dir_env})
if(${library}) if(${${library_env}})
set(PYTHON_LIBRARY "${${library_env}}") set(PYTHON_LIBRARY "${${library_env}}")
endif() endif()
if(${include_dir}) if(${${include_dir_env}})
set(PYTHON_INCLUDE_DIR "${${include_dir_env}}") set(PYTHON_INCLUDE_DIR "${${include_dir_env}}")
endif() endif()

5
cmake/OpenCVFindIPP.cmake
View File

@ -34,6 +34,11 @@ unset(IPP_VERSION_MAJOR)
unset(IPP_VERSION_MINOR) unset(IPP_VERSION_MINOR)
unset(IPP_VERSION_BUILD) 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 because of linker errors. Set BUILD_SHARED_LIBS=OFF")
return()
endif()
set(IPP_X64 0) set(IPP_X64 0)
if(CMAKE_CXX_SIZEOF_DATA_PTR EQUAL 8) if(CMAKE_CXX_SIZEOF_DATA_PTR EQUAL 8)
set(IPP_X64 1) set(IPP_X64 1)

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

@ -2320,7 +2320,10 @@ void cv::minMaxIdx(InputArray _src, double* minVal,
depth == CV_8U ? (ippiMinMaxIndxFuncC1)ippiMinMaxIndx_8u_C1R : depth == CV_8U ? (ippiMinMaxIndxFuncC1)ippiMinMaxIndx_8u_C1R :
depth == CV_8S ? (ippiMinMaxIndxFuncC1)ippiMinMaxIndx_8s_C1R : depth == CV_8S ? (ippiMinMaxIndxFuncC1)ippiMinMaxIndx_8s_C1R :
depth == CV_16U ? (ippiMinMaxIndxFuncC1)ippiMinMaxIndx_16u_C1R : depth == CV_16U ? (ippiMinMaxIndxFuncC1)ippiMinMaxIndx_16u_C1R :
depth == CV_32F ? (ippiMinMaxIndxFuncC1)ippiMinMaxIndx_32f_C1R : 0; #if !((defined _MSC_VER && defined _M_IX86) || defined __i386__)
depth == CV_32F ? (ippiMinMaxIndxFuncC1)ippiMinMaxIndx_32f_C1R :
#endif
0;
CV_SUPPRESS_DEPRECATED_END CV_SUPPRESS_DEPRECATED_END
if( ippFuncC1 ) if( ippFuncC1 )