rename setOptimizations -> setUseOptimizations

pull/3764/head
Vladislav Vinogradov 10 years ago
parent cda6fed41f
commit c10f1851cb
  1. 2
      modules/core/include/opencv2/core/base.hpp
  2. 2
      modules/core/src/system.cpp
  3. 2
      modules/ts/include/opencv2/ts/cuda_test.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

@ -1291,7 +1291,7 @@ void setUseTegra(bool flag)
namespace cv {
void setOptimizations(bool enabled)
void setUseOptimizations(bool enabled)
{
ipp::setUseIPP(enabled);
ocl::setUseOpenCL(enabled);

@ -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

Loading…
Cancel
Save