diff --git a/modules/core/include/opencv2/core/base.hpp b/modules/core/include/opencv2/core/base.hpp index 6ab3e75b709677398312f8f20ab68887fe3ade59..8559fc239794f762d68c5f5b191f551a4806cc7d 100644 --- a/modules/core/include/opencv2/core/base.hpp +++ b/modules/core/include/opencv2/core/base.hpp @@ -727,7 +727,7 @@ CV_EXPORTS void setUseIPP(bool flag); } // ipp -CV_EXPORTS void setOptimizations(bool enabled); +CV_EXPORTS void setUseOptimizations(bool enabled); //! @endcond diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp index 74d73c44e5b07882e66b0980bf32a25093dced70..6152cbe702a63d50d9d556928ad01b086a12fb41 100644 --- a/modules/core/src/system.cpp +++ b/modules/core/src/system.cpp @@ -1291,7 +1291,7 @@ void setUseTegra(bool flag) namespace cv { -void setOptimizations(bool enabled) +void setUseOptimizations(bool enabled) { ipp::setUseIPP(enabled); ocl::setUseOpenCL(enabled); diff --git a/modules/ts/include/opencv2/ts/cuda_test.hpp b/modules/ts/include/opencv2/ts/cuda_test.hpp index 2f4ee6936ee9effb912f5a0f17471d2179064409..d1e1e9db737cce4b1880031e4a4e0e1457447b33 100644 --- a/modules/ts/include/opencv2/ts/cuda_test.hpp +++ b/modules/ts/include/opencv2/ts/cuda_test.hpp @@ -352,7 +352,7 @@ namespace cv { namespace cuda #ifdef HAVE_CUDA #define CV_CUDA_TEST_MAIN(resourcesubdir) \ - CV_TEST_MAIN(resourcesubdir, cvtest::parseCudaDeviceOptions(argc, argv), cvtest::printCudaInfo(), cv::setOptimizations(false)) + CV_TEST_MAIN(resourcesubdir, cvtest::parseCudaDeviceOptions(argc, argv), cvtest::printCudaInfo(), cv::setUseOptimizations(false)) #else // HAVE_CUDA