cleaned up super_resolution sample from old OCL

2014-01-31 21:00:16 +04:00
parent c7fe162829
commit 2e8579fe9b
8 changed files with 27 additions and 245 deletions
--- a/modules/core/include/opencv2/core/mat.hpp
+++ b/modules/core/include/opencv2/core/mat.hpp
@@ -85,10 +85,9 @@ public:
        OPENGL_BUFFER     = 7 << KIND_SHIFT,
        CUDA_MEM          = 8 << KIND_SHIFT,
        GPU_MAT           = 9 << KIND_SHIFT,
-        OCL_MAT           =10 << KIND_SHIFT,
-        UMAT              =11 << KIND_SHIFT,
-        STD_VECTOR_UMAT   =12 << KIND_SHIFT,
-        UEXPR             =13 << KIND_SHIFT
+        UMAT              =10 << KIND_SHIFT,
+        STD_VECTOR_UMAT   =11 << KIND_SHIFT,
+        UEXPR             =12 << KIND_SHIFT
    };

    _InputArray();