diff --git a/3rdparty/ippicv/downloader.cmake b/3rdparty/ippicv/downloader.cmake index 38e6c7b2da..3715214468 100644 --- a/3rdparty/ippicv/downloader.cmake +++ b/3rdparty/ippicv/downloader.cmake @@ -59,12 +59,11 @@ function(_icv_downloader) if(NOT EXISTS "${OPENCV_ICV_PACKAGE_ARCHIVE}") if(NOT DEFINED OPENCV_ICV_URL) - if(NOT DEFINED ENV{OPENCV_ICV_URL}) - # TODO Specify default URL after ICV publishing - message(STATUS "ICV: downloading URL is not specified, skip downloading") - return() + if(DEFINED ENV{OPENCV_ICV_URL}) + set(OPENCV_ICV_URL $ENV{OPENCV_ICV_URL}) + else() + set(OPENCV_ICV_URL "http://sourceforge.net/projects/opencvlibrary/files/3rdparty/ippicv") endif() - set(OPENCV_ICV_URL $ENV{OPENCV_ICV_URL}) endif() file(MAKE_DIRECTORY ${OPENCV_ICV_PACKAGE_ARCHIVE_DIR}) diff --git a/modules/imgproc/perf/perf_cvt_color.cpp b/modules/imgproc/perf/perf_cvt_color.cpp index 4ec464717b..f2da6ce29d 100644 --- a/modules/imgproc/perf/perf_cvt_color.cpp +++ b/modules/imgproc/perf/perf_cvt_color.cpp @@ -248,7 +248,7 @@ PERF_TEST_P(Size_CvtMode, cvtColor8u, ) { Size sz = get<0>(GetParam()); - int mode = get<1>(GetParam()); + int _mode = get<1>(GetParam()), mode = _mode; ChPair ch = getConversionInfo(mode); mode %= COLOR_COLORCVT_MAX; @@ -261,7 +261,11 @@ PERF_TEST_P(Size_CvtMode, cvtColor8u, int runs = sz.width <= 320 ? 100 : 5; TEST_CYCLE_MULTIRUN(runs) cvtColor(src, dst, mode, ch.dcn); +#if defined(__APPLE__) && defined(HAVE_IPP) + SANITY_CHECK(dst, _mode == CX_BGRA2HLS_FULL ? 2 : 1); +#else SANITY_CHECK(dst, 1); +#endif } typedef std::tr1::tuple Size_CvtMode_Bayer_t;