Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv_contrib
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_contrib
Commits
93361768
Commit
93361768
authored
Aug 19, 2014
by
Daniel Angelov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleared shadowing warning.
parent
d9813617
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
ccalib.hpp
modules/ccalib/include/opencv2/ccalib.hpp
+1
-1
ccalib.cpp
modules/ccalib/src/ccalib.cpp
+3
-2
No files found.
modules/ccalib/include/opencv2/ccalib.hpp
View file @
93361768
...
...
@@ -135,7 +135,7 @@ private:
bool
findPatternPass
(
const
Mat
&
image
,
std
::
vector
<
Point2f
>&
matched_features
,
std
::
vector
<
Point3f
>&
pattern_points
,
Mat
&
H
,
std
::
vector
<
Point2f
>&
scene_corners
,
const
double
pratio
,
const
double
proj_error
,
const
bool
refine_position
=
false
,
const
Mat
&
mask
=
Mat
(),
OutputArray
output
=
noArray
());
void
scaleFoundPoints
(
const
double
squareSize
,
const
std
::
vector
<
KeyPoint
>&
corners
,
std
::
vector
<
Point3f
>&
p
oin
ts3d
);
void
scaleFoundPoints
(
const
double
squareSize
,
const
std
::
vector
<
KeyPoint
>&
corners
,
std
::
vector
<
Point3f
>&
pts3d
);
void
check_matches
(
std
::
vector
<
Point2f
>&
matched
,
const
std
::
vector
<
Point2f
>&
pattern
,
std
::
vector
<
DMatch
>&
good
,
std
::
vector
<
Point3f
>&
pattern_3d
,
const
Mat
&
H
);
void
keypoints2points
(
const
std
::
vector
<
KeyPoint
>&
in
,
std
::
vector
<
Point2f
>&
out
);
...
...
modules/ccalib/src/ccalib.cpp
View file @
93361768
...
...
@@ -49,6 +49,7 @@
#include <opencv2/core.hpp>
#include <opencv2/core/types_c.h> // CV_TERM
#include <opencv2/core/core_c.h> // CV_RGB
#include <opencv2/imgproc.hpp>
#include <opencv2/calib3d.hpp>
#include <opencv2/features2d.hpp>
...
...
@@ -185,11 +186,11 @@ Ptr<DescriptorMatcher> CustomPattern::getDescriptorMatcher()
}
void
CustomPattern
::
scaleFoundPoints
(
const
double
pixelSize
,
const
vector
<
KeyPoint
>&
corners
,
vector
<
Point3f
>&
p
oin
ts3d
)
const
vector
<
KeyPoint
>&
corners
,
vector
<
Point3f
>&
pts3d
)
{
for
(
unsigned
int
i
=
0
;
i
<
corners
.
size
();
++
i
)
{
p
oin
ts3d
.
push_back
(
Point3f
(
pts3d
.
push_back
(
Point3f
(
corners
[
i
].
pt
.
x
*
pixelSize
,
corners
[
i
].
pt
.
y
*
pixelSize
,
0
));
...
...
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