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
4be7619c
Commit
4be7619c
authored
Oct 08, 2012
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
_InputArray/_OutputArray destructors are temporary made non-virtual. Please, restore it after 2.4.3
parent
618fbf55
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
OpenCVCompilerOptions.cmake
cmake/OpenCVCompilerOptions.cmake
+1
-1
core.hpp
modules/core/include/opencv2/core/core.hpp
+2
-2
No files found.
cmake/OpenCVCompilerOptions.cmake
View file @
4be7619c
...
@@ -61,7 +61,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
...
@@ -61,7 +61,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
add_extra_compiler_option
(
-W
)
add_extra_compiler_option
(
-W
)
add_extra_compiler_option
(
-Wall
)
add_extra_compiler_option
(
-Wall
)
add_extra_compiler_option
(
-Werror=return-type
)
add_extra_compiler_option
(
-Werror=return-type
)
add_extra_compiler_option
(
-Werror=non-virtual-dtor
)
#
add_extra_compiler_option(-Werror=non-virtual-dtor)
add_extra_compiler_option
(
-Werror=address
)
add_extra_compiler_option
(
-Werror=address
)
add_extra_compiler_option
(
-Werror=sequence-point
)
add_extra_compiler_option
(
-Werror=sequence-point
)
add_extra_compiler_option
(
-Wformat
)
add_extra_compiler_option
(
-Wformat
)
...
...
modules/core/include/opencv2/core/core.hpp
View file @
4be7619c
...
@@ -1333,7 +1333,7 @@ public:
...
@@ -1333,7 +1333,7 @@ public:
virtual
int
channels
(
int
i
=-
1
)
const
;
virtual
int
channels
(
int
i
=-
1
)
const
;
virtual
bool
empty
()
const
;
virtual
bool
empty
()
const
;
virtual
~
_InputArray
();
/*virtual*/
~
_InputArray
();
int
flags
;
int
flags
;
void
*
obj
;
void
*
obj
;
...
@@ -1395,7 +1395,7 @@ public:
...
@@ -1395,7 +1395,7 @@ public:
virtual
void
release
()
const
;
virtual
void
release
()
const
;
virtual
void
clear
()
const
;
virtual
void
clear
()
const
;
virtual
~
_OutputArray
();
/*virtual*/
~
_OutputArray
();
};
};
typedef
const
_InputArray
&
InputArray
;
typedef
const
_InputArray
&
InputArray
;
...
...
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