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

Merge pull request #2217 from ilya-lavrenov:tapi_superres

Browse Source
This commit is contained in:
Andrey Pavlenko
2014-02-03 14:38:59 +04:00
committed by OpenCV Buildbot
parent 13875b5fbc 6ad4823f0c
commit 0fef7f8b96
18 changed files with 886 additions and 1499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/include/opencv2/core/mat.hpp
View File

@@ -217,7 +217,7 @@ public:
virtual void createSameSize(const _InputArray& arr, int mtype) const;
virtual void release() const;
virtual void clear() const;
virtual void setTo(const _InputArray& value) const;
virtual void setTo(const _InputArray& value, const _InputArray & mask = _InputArray()) const;
};

2
modules/core/include/opencv2/core/opencl/ocl_defs.hpp
View File

@@ -5,6 +5,8 @@
// Copyright (C) 2014, Advanced Micro Devices, Inc., all rights reserved.
// Third party copyrights are property of their respective owners.
//#define CV_OPENCL_RUN_VERBOSE
#ifdef HAVE_OPENCL
#ifdef CV_OPENCL_RUN_VERBOSE