Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
e8357c05
Commit
e8357c05
authored
Jul 13, 2017
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: added DEBUG build guard
To prevent linkage of binary incompatible DEBUG/RELEASE binaries/runtimes
parent
95a438d2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
0 deletions
+25
-0
cvdef.h
modules/core/include/opencv2/core/cvdef.h
+17
-0
mat.hpp
modules/core/include/opencv2/core/mat.hpp
+4
-0
mat.inl.hpp
modules/core/include/opencv2/core/mat.inl.hpp
+4
-0
No files found.
modules/core/include/opencv2/core/cvdef.h
View file @
e8357c05
...
...
@@ -48,6 +48,23 @@
//! @addtogroup core_utils
//! @{
#if !defined CV_DOXYGEN && !defined CV_IGNORE_DEBUG_BUILD_GUARD
#if (defined(_MSC_VER) && (defined(DEBUG) || defined(_DEBUG))) || \
(defined(_GLIBCXX_DEBUG) || defined(_GLIBCXX_DEBUG_PEDANTIC))
// Guard to prevent using of binary incompatible binaries / runtimes
// https://github.com/opencv/opencv/pull/9161
#define CV__DEBUG_NS_BEGIN namespace debug_build_guard {
#define CV__DEBUG_NS_END }
namespace
cv
{
namespace
debug_build_guard
{
}
using
namespace
debug_build_guard
;
}
#endif
#endif
#ifndef CV__DEBUG_NS_BEGIN
#define CV__DEBUG_NS_BEGIN
#define CV__DEBUG_NS_END
#endif
#ifdef __OPENCV_BUILD
#include "cvconfig.h"
#endif
...
...
modules/core/include/opencv2/core/mat.hpp
View file @
e8357c05
...
...
@@ -62,6 +62,8 @@ namespace cv
enum
{
ACCESS_READ
=
1
<<
24
,
ACCESS_WRITE
=
1
<<
25
,
ACCESS_RW
=
3
<<
24
,
ACCESS_MASK
=
ACCESS_RW
,
ACCESS_FAST
=
1
<<
26
};
CV__DEBUG_NS_BEGIN
class
CV_EXPORTS
_OutputArray
;
//////////////////////// Input/Output Array Arguments /////////////////////////////////
...
...
@@ -400,6 +402,8 @@ public:
};
CV__DEBUG_NS_END
typedef
const
_InputArray
&
InputArray
;
typedef
InputArray
InputArrayOfArrays
;
typedef
const
_OutputArray
&
OutputArray
;
...
...
modules/core/include/opencv2/core/mat.inl.hpp
View file @
e8357c05
...
...
@@ -56,6 +56,8 @@
namespace
cv
{
CV__DEBUG_NS_BEGIN
//! @cond IGNORED
...
...
@@ -392,6 +394,8 @@ inline _InputOutputArray::_InputOutputArray(const ogl::Buffer& buf)
inline
_InputOutputArray
::
_InputOutputArray
(
const
cuda
::
HostMem
&
cuda_mem
)
{
init
(
FIXED_TYPE
+
FIXED_SIZE
+
CUDA_HOST_MEM
+
ACCESS_RW
,
&
cuda_mem
);
}
CV__DEBUG_NS_END
//////////////////////////////////////////// Mat //////////////////////////////////////////
inline
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment