From c10f1851cb32d6f6253c4a42ec3cc286684a2389 Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Fri, 27 Feb 2015 12:52:28 +0300 Subject: [PATCH] rename setOptimizations -> setUseOptimizations --- modules/core/include/opencv2/core/base.hpp | 2 +- modules/core/src/system.cpp | 2 +- modules/ts/include/opencv2/ts/cuda_test.hpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/core/include/opencv2/core/base.hpp b/modules/core/include/opencv2/core/base.hpp index 6ab3e75b70..8559fc2397 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 74d73c44e5..6152cbe702 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 2f4ee6936e..d1e1e9db73 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