Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
seo young Joung
opencv
Commits
d957e8e4
Commit
d957e8e4
authored
11 years ago
by
Ilya Lavrenov
Browse files
Options
Download
Email Patches
Plain Diff
attempt to fix pure virtual call in Mat::deallocate
parent
42ac3123
4.x
3.4
5.x
master
next
4.5.5
4.5.4
4.5.3
4.5.3-openvino
4.5.3-openvino-2021.4.2
4.5.3-openvino-2021.4.1
4.5.2
4.5.2-openvino
4.5.1
4.5.1-openvino
4.5.0
4.5.0-openvino
4.4.0
4.4.0-openvino
4.3.0
4.3.0-openvino
4.3.0-openvino-2020.3.0
4.2.0
4.2.0-openvino
4.1.2
4.1.2-openvino
4.1.1
4.1.1-openvino
4.1.0
4.1.0-openvino
4.0.1
4.0.1-openvino
4.0.0
4.0.0-rc
4.0.0-openvino
4.0.0-beta
4.0.0-alpha
3.4.17
3.4.16
3.4.15
3.4.14
3.4.13
3.4.12
3.4.11
3.4.10
3.4.9
3.4.8
3.4.7
3.4.6
3.4.5
3.4.4
3.4.3
3.4.3-openvino
3.4.2
3.4.2-openvino
3.4.1
3.4.1-cvsdk
3.4.0
3.4.0-rc
3.3.1
3.3.1-cvsdk
3.3.0
3.3.0-rc
3.3.0-cvsdk
3.2.0
3.2.0-rc
3.1.0
3.0.0
3.0.0-rc1
3.0.0-beta
3.0.0-alpha
3.0-ocl-tp2
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/core/src/matrix.cpp
+2
-2
modules/core/src/matrix.cpp
modules/core/src/ocl.cpp
+2
-2
modules/core/src/ocl.cpp
with
4 additions
and
4 deletions
+4
-4
modules/core/src/matrix.cpp
View file @
d957e8e4
...
...
@@ -222,8 +222,8 @@ public:
MatAllocator
*
Mat
::
getStdAllocator
()
{
static
Std
MatAllocator
allocator
;
return
&
allocator
;
static
MatAllocator
*
allocator
=
new
StdMatAllocator
()
;
return
allocator
;
}
void
swap
(
Mat
&
a
,
Mat
&
b
)
...
...
This diff is collapsed.
Click to expand it.
modules/core/src/ocl.cpp
View file @
d957e8e4
...
...
@@ -3959,8 +3959,8 @@ public:
MatAllocator
*
getOpenCLAllocator
()
{
static
OpenCL
Allocator
allocator
;
return
&
allocator
;
static
Mat
Allocator
*
allocator
=
new
OpenCLAllocator
()
;
return
allocator
;
}
///////////////////////////////////////////// Utility functions /////////////////////////////////////////////////
...
...
This diff is collapsed.
Click to expand it.
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
Menu
Projects
Groups
Snippets
Help