Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_oclgfft

diff --cc modules/ocl/include/opencv2/ocl/private/util.hpp
Simple merge

diff --cc modules/ocl/src/mcwutil.cpp
index b1f8eebf6426843f0fb5795011250ae9c7cc8299,79800c5242716f36a757b7430b127ea915c1dbc1..75314fb49c5476aa7b6f6e203b687543479922c7
--- 1/modules/ocl/src/mcwutil.cpp
--- 2/modules/ocl/src/mcwutil.cpp
+++ b/modules/ocl/src/mcwutil.cpp
@@@ -225,11 -240,9 +240,14 @@@ namespace c
              openCLSafeCall(err);
              return texture;
          }
- 
+ #ifdef __GNUC__
+         GCC_DIAG_ON(deprecated-declarations)
+ #endif
++
 +        Ptr<TextureCL> bindTexturePtr(const oclMat &mat)
 +        {
 +            return Ptr<TextureCL>(new TextureCL(bindTexture(mat), mat.rows, mat.cols, mat.type()));
 +        }
          void releaseTexture(cl_mem& texture)
          {
              openCLFree(texture);