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

Merge pull request #2586 from ilya-lavrenov:ipp_disable

Browse Source
This commit is contained in:
Andrey Pavlenko
2014-04-09 14:16:24 +04:00
committed by OpenCV Buildbot
parent e013f04669 e090aa07db
commit e6d6a3a85b
7 changed files with 79 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2031,7 +2031,7 @@ double cv::norm( InputArray _src, int normType, InputArray _mask )
normType == NORM_INF ?
(type == CV_8UC1 ? (ippiMaskNormFuncC1)ippiNorm_Inf_8u_C1MR :
type == CV_8SC1 ? (ippiMaskNormFuncC1)ippiNorm_Inf_8s_C1MR :
type == CV_16UC1 ? (ippiMaskNormFuncC1)ippiNorm_Inf_16u_C1MR :
// type == CV_16UC1 ? (ippiMaskNormFuncC1)ippiNorm_Inf_16u_C1MR :
type == CV_32FC1 ? (ippiMaskNormFuncC1)ippiNorm_Inf_32f_C1MR :
0) :
normType == NORM_L1 ?