Skip to content

Commit 11c2ffa

Browse files
author
Pavel Vlasov
committed
Update for IPP for OpenCV 2017u2 integration;
Updated integrations for: cv::split cv::merge cv::insertChannel cv::extractChannel cv::Mat::convertTo - now with scaled conversions support cv::LUT - disabled due to performance issues Mat::copyTo Mat::setTo cv::flip cv::copyMakeBorder - currently disabled cv::polarToCart cv::pow - ipp pow function was removed due to performance issues cv::hal::magnitude32f/64f - disabled for <= SSE42, poor performance cv::countNonZero cv::minMaxIdx cv::norm cv::canny - new integration. Disabled for threaded; cv::cornerHarris cv::boxFilter cv::bilateralFilter cv::integral
1 parent f1c8094 commit 11c2ffa

21 files changed

+1372
-1225
lines changed

‎3rdparty/ippicv/ippicv.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function(download_ippicv root_var)
2121
set(OPENCV_ICV_NAME "ippicv_2017u2_lnx_intel64_20170418.tgz")
2222
set(OPENCV_ICV_HASH "87cbdeb627415d8e4bc811156289fa3a")
2323
else()
24-
set(OPENCV_ICV_NAME "ippicv_2017u2_lnx_ia32_20170406.tgz")
24+
set(OPENCV_ICV_NAME "ippicv_2017u2_lnx_ia32_20170418.tgz")
2525
set(OPENCV_ICV_HASH "f2cece00d802d4dea86df52ed095257e")
2626
endif()
2727
elseif(WIN32 AND NOT ARM)

‎modules/core/include/opencv2/core/private.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,6 @@ CV_EXPORTS void scalarToRawData(const cv::Scalar& s, void* buf, int type, int un
217217
#define IPP_DISABLE_PERF_MAG_SSE42 1 // cv::magnitude optimizations problem
218218
#define IPP_DISABLE_PERF_BOX16S_SSE42 1 // cv::boxFilter optimizations problem
219219

220-
#define IPP_DISABLE_BLOCK 0 // legacy switch
221-
222220
#ifdef HAVE_IPP
223221
#include "ippversion.h"
224222
#ifndef IPP_VERSION_UPDATE // prior to 7.1

0 commit comments

Comments
 (0)