From: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu, 10 Oct 2013 11:55:58 +0000 (+0400)
Subject: Merge pull request #1592 from alalek:ocl_program_cache_update
X-Git-Tag: accepted/tizen/ivi/20140515.103456~1^2~425
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d5723480e19e31028ffe5f4f289d5fbc83507e7f;p=profile%2Fivi%2Fopencv.git

Merge pull request #1592 from alalek:ocl_program_cache_update
---

d5723480e19e31028ffe5f4f289d5fbc83507e7f
diff --cc modules/ocl/src/cl_programcache.cpp
index 0e8b5be,741df87..0bd4439
--- a/modules/ocl/src/cl_programcache.cpp
+++ b/modules/ocl/src/cl_programcache.cpp
@@@ -50,9 -50,23 +50,8 @@@
  #include <fstream>
  #include "cl_programcache.hpp"
  
 -// workaround for OpenCL C++ bindings
 -#if defined(HAVE_OPENCL12)
 -#include "opencv2/ocl/cl_runtime/cl_runtime_opencl12_wrappers.hpp"
 -#elif defined(HAVE_OPENCL11)
 -#include "opencv2/ocl/cl_runtime/cl_runtime_opencl11_wrappers.hpp"
 -#else
 -#error Invalid OpenCL configuration
 -#endif
 -
 -#if defined _MSC_VER && _MSC_VER >= 1200
 -#  pragma warning( disable: 4100 4244 4267 4510 4512 4610)
 -#endif
 -#undef __CL_ENABLE_EXCEPTIONS
 -#include <CL/cl.hpp>
 -
  namespace cv { namespace ocl {
  
- #define MAX_PROG_CACHE_SIZE 1024
  /*
   * The binary caching system to eliminate redundant program source compilation.
   * Strictly, this is not a cache because we do not implement evictions right now.