Merge pull request #18986 from alalek:fix_ipp_17453_2

4 years ago · e958600f32
parent 484251c52b 91ce6ef190
commit e958600f32
1 changed files with 1 additions and 3 deletions
--- a/modules/core/src/count_non_zero.dispatch.cpp
+++ b/modules/core/src/count_non_zero.dispatch.cpp
@ -62,11 +62,9 @@ static bool ipp_countNonZero( Mat &src, int &res )
 {
    CV_INSTRUMENT_REGION_IPP();

-#if defined __APPLE__ || (defined _MSC_VER && defined _M_IX86)
    // see https://github.com/opencv/opencv/issues/17453
-    if (src.dims <= 2 && src.step > 520000)
+    if (src.dims <= 2 && src.step > 520000 && cv::ipp::getIppTopFeatures() == ippCPUID_SSE42)
        return false;
-#endif

 #if IPP_VERSION_X100 < 201801
    // Poor performance of SSE42