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

Merge pull request #2788 from alalek:icv_public

Browse Source
This commit is contained in:
Alexander Alekhin 2014-05-27 18:52:01 +04:00 committed by OpenCV Buildbot
commit c9db91ace5
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
3rdparty/ippicv/downloader.cmake vendored
View File

@ -59,12 +59,11 @@ function(_icv_downloader)
if(NOT EXISTS "${OPENCV_ICV_PACKAGE_ARCHIVE}") if(NOT EXISTS "${OPENCV_ICV_PACKAGE_ARCHIVE}")
if(NOT DEFINED OPENCV_ICV_URL) if(NOT DEFINED OPENCV_ICV_URL)
if(NOT DEFINED ENV{OPENCV_ICV_URL}) if(DEFINED ENV{OPENCV_ICV_URL})
# TODO Specify default URL after ICV publishing set(OPENCV_ICV_URL $ENV{OPENCV_ICV_URL})
message(STATUS "ICV: downloading URL is not specified, skip downloading") else()
return() set(OPENCV_ICV_URL "http://sourceforge.net/projects/opencvlibrary/files/3rdparty/ippicv")
endif() endif()
set(OPENCV_ICV_URL $ENV{OPENCV_ICV_URL})
endif() endif()
file(MAKE_DIRECTORY ${OPENCV_ICV_PACKAGE_ARCHIVE_DIR}) file(MAKE_DIRECTORY ${OPENCV_ICV_PACKAGE_ARCHIVE_DIR})

6
modules/imgproc/perf/perf_cvt_color.cpp
View File

@ -248,7 +248,7 @@ PERF_TEST_P(Size_CvtMode, cvtColor8u,
) )
{ {
Size sz = get<0>(GetParam()); Size sz = get<0>(GetParam());
int mode = get<1>(GetParam()); int _mode = get<1>(GetParam()), mode = _mode;
ChPair ch = getConversionInfo(mode); ChPair ch = getConversionInfo(mode);
mode %= COLOR_COLORCVT_MAX; mode %= COLOR_COLORCVT_MAX;
@ -261,7 +261,11 @@ PERF_TEST_P(Size_CvtMode, cvtColor8u,
int runs = sz.width <= 320 ? 100 : 5; int runs = sz.width <= 320 ? 100 : 5;
TEST_CYCLE_MULTIRUN(runs) cvtColor(src, dst, mode, ch.dcn); 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); SANITY_CHECK(dst, 1);
#endif
} }
typedef std::tr1::tuple<Size, CvtModeBayer> Size_CvtMode_Bayer_t; typedef std::tr1::tuple<Size, CvtModeBayer> Size_CvtMode_Bayer_t;