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

Fix a bug caused by NDEBUG macro; it is now removed.

Browse Source 
Revise some descriptions of the enums.
This commit is contained in:
peng xiao 2013-06-14 16:37:00 +08:00
parent c8398c9fdc
commit e6b18fc492
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/ocl/include/opencv2/ocl/ocl.hpp
View File

@ -179,16 +179,21 @@ namespace cv
bool cleanUp = true); bool cleanUp = true);
//! Enable or disable OpenCL program binary caching onto local disk //! Enable or disable OpenCL program binary caching onto local disk
// After a program (*.cl files in opencl/ folder) is built at runtime, we allow the compiled program to be // After a program (*.cl files in opencl/ folder) is built at runtime, we allow the
// cached onto local disk automatically, which may accelerate subsequent runs. // compiled OpenCL program to be cached to the path automatically as "path/*.clb"
// Caching mode is controlled by the following enum // binary file, which will be reused when the OpenCV executable is started again.
// Note, the feature is by default enabled when OpenCV is built in release mode. //
// Caching mode is controlled by the following enums
// Notes
// 1. the feature is by default enabled when OpenCV is built in release mode.
// 2. the CACHE_DEBUG / CACHE_RELEASE flags only effectively work with MSVC compiler;
// for GNU compilers, the function always treats the build as release mode (enabled by default).
enum enum
{ {
CACHE_NONE = 0, CACHE_NONE = 0, // do not cache OpenCL binary
CACHE_DEBUG = 0x1 << 0, CACHE_DEBUG = 0x1 << 0, // cache OpenCL binary when built in debug mode (only work with MSVC)
CACHE_RELEASE = 0x1 << 1, CACHE_RELEASE = 0x1 << 1, // default behavior, only cache when built in release mode (only work with MSVC)
CACHE_ALL = CACHE_DEBUG | CACHE_RELEASE, CACHE_ALL = CACHE_DEBUG | CACHE_RELEASE, // always cache opencl binary
CACHE_UPDATE = 0x1 << 2 // if the binary cache file with the same name is already on the disk, it will be updated. CACHE_UPDATE = 0x1 << 2 // if the binary cache file with the same name is already on the disk, it will be updated.
}; };
CV_EXPORTS void setBinaryDiskCache(int mode = CACHE_RELEASE, cv::String path = "./"); CV_EXPORTS void setBinaryDiskCache(int mode = CACHE_RELEASE, cv::String path = "./");

2
modules/ocl/src/initialization.cpp
View File

@ -508,7 +508,7 @@ namespace cv
{ {
impl->update_disk_cache = (mode & CACHE_UPDATE) == CACHE_UPDATE; impl->update_disk_cache = (mode & CACHE_UPDATE) == CACHE_UPDATE;
impl->enable_disk_cache = impl->enable_disk_cache =
#if !defined(NDEBUG) || defined(_DEBUG) #ifdef _DEBUG
(mode & CACHE_DEBUG) == CACHE_DEBUG; (mode & CACHE_DEBUG) == CACHE_DEBUG;
#else #else
(mode & CACHE_RELEASE) == CACHE_RELEASE; (mode & CACHE_RELEASE) == CACHE_RELEASE;