1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00

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

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
+1 -1
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 )