Renew function logic.

pull/1060/head
peng xiao 12 years ago
parent 14dd345cdf
commit e858a6c347
  1. 14
      modules/ocl/src/initialization.cpp

@ -168,13 +168,13 @@ namespace cv
}; };
// global variables to hold binary cache properties // global variables to hold binary cache properties
static bool enable_disk_cache = static int enable_disk_cache =
#ifdef _DEBUG #ifdef _DEBUG
false; false;
#else #else
true; true;
#endif #endif
static bool update_disk_cache = false; static int update_disk_cache = false;
static String binpath = ""; static String binpath = "";
Info::Impl::Impl() Info::Impl::Impl()
@ -506,8 +506,14 @@ namespace cv
void setBinaryDiskCache(int mode, String path) void setBinaryDiskCache(int mode, String path)
{ {
update_disk_cache = (mode & CACHE_UPDATE) == CACHE_UPDATE; if(mode == CACHE_NONE)
enable_disk_cache = {
update_disk_cache = 0;
enable_disk_cache = 0;
return;
}
update_disk_cache |= (mode & CACHE_UPDATE) == CACHE_UPDATE;
enable_disk_cache |=
#ifdef _DEBUG #ifdef _DEBUG
(mode & CACHE_DEBUG) == CACHE_DEBUG; (mode & CACHE_DEBUG) == CACHE_DEBUG;
#else #else

Loading…
Cancel
Save