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
1e1f20cf
Commit
1e1f20cf
authored
Oct 12, 2015
by
Dan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improved consistency.
parent
3d1355ef
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
mat.hpp
modules/core/include/opencv2/core/mat.hpp
+1
-1
matrix.cpp
modules/core/src/matrix.cpp
+2
-2
No files found.
modules/core/include/opencv2/core/mat.hpp
View file @
1e1f20cf
...
...
@@ -194,7 +194,7 @@ public:
UMat
getUMat
(
int
idx
=-
1
)
const
;
void
getMatVector
(
std
::
vector
<
Mat
>&
mv
)
const
;
void
getUMatVector
(
std
::
vector
<
UMat
>&
umv
)
const
;
void
getGpuMatVector
(
std
::
vector
<
cuda
::
GpuMat
>
**
gpumv
)
const
;
void
getGpuMatVector
(
std
::
vector
<
cuda
::
GpuMat
>
&
gpumv
)
const
;
cuda
::
GpuMat
getGpuMat
()
const
;
ogl
::
Buffer
getOGlBuffer
()
const
;
...
...
modules/core/src/matrix.cpp
View file @
1e1f20cf
...
...
@@ -1429,12 +1429,12 @@ cuda::GpuMat _InputArray::getGpuMat() const
CV_Error
(
cv
::
Error
::
StsNotImplemented
,
"getGpuMat is available only for cuda::GpuMat and cuda::HostMem"
);
return
cuda
::
GpuMat
();
}
void
_InputArray
::
getGpuMatVector
(
std
::
vector
<
cuda
::
GpuMat
>
**
gpumv
)
const
void
_InputArray
::
getGpuMatVector
(
std
::
vector
<
cuda
::
GpuMat
>
&
gpumv
)
const
{
int
k
=
kind
();
if
(
k
==
STD_VECTOR_CUDA_GPU_MAT
)
{
*
gpumv
=
(
std
::
vector
<
cuda
::
GpuMat
>*
)
obj
;
gpumv
=
*
(
std
::
vector
<
cuda
::
GpuMat
>*
)
obj
;
}
}
ogl
::
Buffer
_InputArray
::
getOGlBuffer
()
const
...
...
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