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
6f175a3c
Commit
6f175a3c
authored
Sep 20, 2012
by
Vladislav Vinogradov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changed the type of the arguments to const reference (Bug #2376)
ORB_GPU::downloadKeyPoints ORB_GPU::convertKeyPoints
parent
2e363386
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
gpu.hpp
modules/gpu/include/opencv2/gpu/gpu.hpp
+2
-2
orb.cpp
modules/gpu/src/orb.cpp
+10
-10
No files found.
modules/gpu/include/opencv2/gpu/gpu.hpp
View file @
6f175a3c
...
...
@@ -1690,9 +1690,9 @@ public:
void
operator
()(
const
GpuMat
&
image
,
const
GpuMat
&
mask
,
GpuMat
&
keypoints
,
GpuMat
&
descriptors
);
//! download keypoints from device to host memory
static
void
downloadKeyPoints
(
GpuMat
&
d_keypoints
,
std
::
vector
<
KeyPoint
>&
keypoints
);
static
void
downloadKeyPoints
(
const
GpuMat
&
d_keypoints
,
std
::
vector
<
KeyPoint
>&
keypoints
);
//! convert keypoints to KeyPoint vector
static
void
convertKeyPoints
(
Mat
&
d_keypoints
,
std
::
vector
<
KeyPoint
>&
keypoints
);
static
void
convertKeyPoints
(
const
Mat
&
d_keypoints
,
std
::
vector
<
KeyPoint
>&
keypoints
);
//! returns the descriptor size in bytes
inline
int
descriptorSize
()
const
{
return
kBytes
;
}
...
...
modules/gpu/src/orb.cpp
View file @
6f175a3c
...
...
@@ -53,8 +53,8 @@ void cv::gpu::ORB_GPU::operator()(const GpuMat&, const GpuMat&, std::vector<KeyP
void
cv
::
gpu
::
ORB_GPU
::
operator
()(
const
GpuMat
&
,
const
GpuMat
&
,
GpuMat
&
)
{
throw_nogpu
();
}
void
cv
::
gpu
::
ORB_GPU
::
operator
()(
const
GpuMat
&
,
const
GpuMat
&
,
std
::
vector
<
KeyPoint
>&
,
GpuMat
&
)
{
throw_nogpu
();
}
void
cv
::
gpu
::
ORB_GPU
::
operator
()(
const
GpuMat
&
,
const
GpuMat
&
,
GpuMat
&
,
GpuMat
&
)
{
throw_nogpu
();
}
void
cv
::
gpu
::
ORB_GPU
::
downloadKeyPoints
(
GpuMat
&
,
std
::
vector
<
KeyPoint
>&
)
{
throw_nogpu
();
}
void
cv
::
gpu
::
ORB_GPU
::
convertKeyPoints
(
Mat
&
,
std
::
vector
<
KeyPoint
>&
)
{
throw_nogpu
();
}
void
cv
::
gpu
::
ORB_GPU
::
downloadKeyPoints
(
const
GpuMat
&
,
std
::
vector
<
KeyPoint
>&
)
{
throw_nogpu
();
}
void
cv
::
gpu
::
ORB_GPU
::
convertKeyPoints
(
const
Mat
&
,
std
::
vector
<
KeyPoint
>&
)
{
throw_nogpu
();
}
void
cv
::
gpu
::
ORB_GPU
::
release
()
{
throw_nogpu
();
}
void
cv
::
gpu
::
ORB_GPU
::
buildScalePyramids
(
const
GpuMat
&
,
const
GpuMat
&
)
{
throw_nogpu
();
}
void
cv
::
gpu
::
ORB_GPU
::
computeKeyPointsPyramid
()
{
throw_nogpu
();
}
...
...
@@ -685,7 +685,7 @@ void cv::gpu::ORB_GPU::mergeKeyPoints(GpuMat& keypoints)
}
}
void
cv
::
gpu
::
ORB_GPU
::
downloadKeyPoints
(
GpuMat
&
d_keypoints
,
std
::
vector
<
KeyPoint
>&
keypoints
)
void
cv
::
gpu
::
ORB_GPU
::
downloadKeyPoints
(
const
GpuMat
&
d_keypoints
,
std
::
vector
<
KeyPoint
>&
keypoints
)
{
if
(
d_keypoints
.
empty
())
{
...
...
@@ -698,7 +698,7 @@ void cv::gpu::ORB_GPU::downloadKeyPoints(GpuMat& d_keypoints, std::vector<KeyPoi
convertKeyPoints
(
h_keypoints
,
keypoints
);
}
void
cv
::
gpu
::
ORB_GPU
::
convertKeyPoints
(
Mat
&
d_keypoints
,
std
::
vector
<
KeyPoint
>&
keypoints
)
void
cv
::
gpu
::
ORB_GPU
::
convertKeyPoints
(
const
Mat
&
d_keypoints
,
std
::
vector
<
KeyPoint
>&
keypoints
)
{
if
(
d_keypoints
.
empty
())
{
...
...
@@ -708,12 +708,12 @@ void cv::gpu::ORB_GPU::convertKeyPoints(Mat& d_keypoints, std::vector<KeyPoint>&
CV_Assert
(
d_keypoints
.
type
()
==
CV_32FC1
&&
d_keypoints
.
rows
==
ROWS_COUNT
);
float
*
x_ptr
=
d_keypoints
.
ptr
<
float
>
(
X_ROW
);
float
*
y_ptr
=
d_keypoints
.
ptr
<
float
>
(
Y_ROW
);
float
*
response_ptr
=
d_keypoints
.
ptr
<
float
>
(
RESPONSE_ROW
);
float
*
angle_ptr
=
d_keypoints
.
ptr
<
float
>
(
ANGLE_ROW
);
float
*
octave_ptr
=
d_keypoints
.
ptr
<
float
>
(
OCTAVE_ROW
);
float
*
size_ptr
=
d_keypoints
.
ptr
<
float
>
(
SIZE_ROW
);
const
float
*
x_ptr
=
d_keypoints
.
ptr
<
float
>
(
X_ROW
);
const
float
*
y_ptr
=
d_keypoints
.
ptr
<
float
>
(
Y_ROW
);
const
float
*
response_ptr
=
d_keypoints
.
ptr
<
float
>
(
RESPONSE_ROW
);
const
float
*
angle_ptr
=
d_keypoints
.
ptr
<
float
>
(
ANGLE_ROW
);
const
float
*
octave_ptr
=
d_keypoints
.
ptr
<
float
>
(
OCTAVE_ROW
);
const
float
*
size_ptr
=
d_keypoints
.
ptr
<
float
>
(
SIZE_ROW
);
keypoints
.
resize
(
d_keypoints
.
cols
);
...
...
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