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
caf7fa97
Commit
caf7fa97
authored
Sep 30, 2016
by
mshabunin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding Java wrappers for Aruco module
parent
898fbd77
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
12 deletions
+12
-12
aruco.hpp
modules/aruco/include/opencv2/aruco.hpp
+4
-4
charuco.hpp
modules/aruco/include/opencv2/aruco/charuco.hpp
+4
-4
aruco.cpp
modules/aruco/src/aruco.cpp
+3
-3
charuco.cpp
modules/aruco/src/charuco.cpp
+1
-1
No files found.
modules/aruco/include/opencv2/aruco.hpp
View file @
caf7fa97
...
@@ -234,7 +234,7 @@ class CV_EXPORTS_W Board {
...
@@ -234,7 +234,7 @@ class CV_EXPORTS_W Board {
* @param ids vector of the identifiers of the markers in the board
* @param ids vector of the identifiers of the markers in the board
*
*
*/
*/
CV_WRAP
static
Ptr
<
Board
>
create
(
InputArrayOfArrays
objPoints
,
Ptr
<
Dictionary
>
&
dictionary
,
InputArray
ids
);
CV_WRAP
static
Ptr
<
Board
>
create
(
InputArrayOfArrays
objPoints
,
const
Ptr
<
Dictionary
>
&
dictionary
,
InputArray
ids
);
// array of object points of all the marker corners in the board
// array of object points of all the marker corners in the board
// each marker include its 4 corners, i.e. for M markers, the size is Mx4
// each marker include its 4 corners, i.e. for M markers, the size is Mx4
CV_PROP
std
::
vector
<
std
::
vector
<
Point3f
>
>
objPoints
;
CV_PROP
std
::
vector
<
std
::
vector
<
Point3f
>
>
objPoints
;
...
@@ -517,11 +517,11 @@ void _drawPlanarBoardImpl(Board *board, Size outSize, OutputArray img,
...
@@ -517,11 +517,11 @@ void _drawPlanarBoardImpl(Board *board, Size outSize, OutputArray img,
* calibration in calibrateCamera(). The function returns the final re-projection error.
* calibration in calibrateCamera(). The function returns the final re-projection error.
*/
*/
CV_EXPORTS_AS
(
calibrateCameraArucoExtended
)
double
calibrateCameraAruco
(
CV_EXPORTS_AS
(
calibrateCameraArucoExtended
)
double
calibrateCameraAruco
(
InputArrayOfArrays
corners
,
InputArray
ids
,
InputArray
counter
,
Ptr
<
Board
>
&
board
,
InputArrayOfArrays
corners
,
InputArray
ids
,
InputArray
counter
,
const
Ptr
<
Board
>
&
board
,
Size
imageSize
,
InputOutputArray
cameraMatrix
,
InputOutputArray
distCoeffs
,
Size
imageSize
,
InputOutputArray
cameraMatrix
,
InputOutputArray
distCoeffs
,
OutputArrayOfArrays
rvecs
,
OutputArrayOfArrays
tvecs
,
OutputArrayOfArrays
rvecs
,
OutputArrayOfArrays
tvecs
,
OutputArray
stdDeviationsIntrinsics
=
noArray
(),
OutputArray
stdDeviationsExtrinsics
=
noArray
()
,
OutputArray
stdDeviationsIntrinsics
,
OutputArray
stdDeviationsExtrinsics
,
OutputArray
perViewErrors
=
noArray
()
,
int
flags
=
0
,
OutputArray
perViewErrors
,
int
flags
=
0
,
TermCriteria
criteria
=
TermCriteria
(
TermCriteria
::
COUNT
+
TermCriteria
::
EPS
,
30
,
DBL_EPSILON
));
TermCriteria
criteria
=
TermCriteria
(
TermCriteria
::
COUNT
+
TermCriteria
::
EPS
,
30
,
DBL_EPSILON
));
...
...
modules/aruco/include/opencv2/aruco/charuco.hpp
View file @
caf7fa97
...
@@ -239,11 +239,11 @@ CV_EXPORTS_W void drawDetectedCornersCharuco(InputOutputArray image, InputArray
...
@@ -239,11 +239,11 @@ CV_EXPORTS_W void drawDetectedCornersCharuco(InputOutputArray image, InputArray
* The function returns the final re-projection error.
* The function returns the final re-projection error.
*/
*/
CV_EXPORTS_AS
(
calibrateCameraCharucoExtended
)
double
calibrateCameraCharuco
(
CV_EXPORTS_AS
(
calibrateCameraCharucoExtended
)
double
calibrateCameraCharuco
(
InputArrayOfArrays
charucoCorners
,
InputArrayOfArrays
charucoIds
,
Ptr
<
CharucoBoard
>
&
board
,
InputArrayOfArrays
charucoCorners
,
InputArrayOfArrays
charucoIds
,
const
Ptr
<
CharucoBoard
>
&
board
,
Size
imageSize
,
InputOutputArray
cameraMatrix
,
InputOutputArray
distCoeffs
,
Size
imageSize
,
InputOutputArray
cameraMatrix
,
InputOutputArray
distCoeffs
,
OutputArrayOfArrays
rvecs
=
noArray
(),
OutputArrayOfArrays
tvecs
=
noArray
()
,
OutputArrayOfArrays
rvecs
,
OutputArrayOfArrays
tvecs
,
OutputArray
stdDeviationsIntrinsics
=
noArray
(),
OutputArray
stdDeviationsExtrinsics
=
noArray
()
,
OutputArray
stdDeviationsIntrinsics
,
OutputArray
stdDeviationsExtrinsics
,
OutputArray
perViewErrors
=
noArray
()
,
int
flags
=
0
,
OutputArray
perViewErrors
,
int
flags
=
0
,
TermCriteria
criteria
=
TermCriteria
(
TermCriteria
::
COUNT
+
TermCriteria
::
EPS
,
30
,
DBL_EPSILON
));
TermCriteria
criteria
=
TermCriteria
(
TermCriteria
::
COUNT
+
TermCriteria
::
EPS
,
30
,
DBL_EPSILON
));
/** @brief It's the same function as #calibrateCameraCharuco but without calibration error estimation.
/** @brief It's the same function as #calibrateCameraCharuco but without calibration error estimation.
...
...
modules/aruco/src/aruco.cpp
View file @
caf7fa97
...
@@ -1301,7 +1301,7 @@ void GridBoard::draw(Size outSize, OutputArray _img, int marginSize, int borderB
...
@@ -1301,7 +1301,7 @@ void GridBoard::draw(Size outSize, OutputArray _img, int marginSize, int borderB
/**
/**
*/
*/
Ptr
<
Board
>
Board
::
create
(
InputArrayOfArrays
objPoints
,
Ptr
<
Dictionary
>
&
dictionary
,
InputArray
ids
)
{
Ptr
<
Board
>
Board
::
create
(
InputArrayOfArrays
objPoints
,
const
Ptr
<
Dictionary
>
&
dictionary
,
InputArray
ids
)
{
CV_Assert
(
objPoints
.
total
()
==
ids
.
total
());
CV_Assert
(
objPoints
.
total
()
==
ids
.
total
());
CV_Assert
(
objPoints
.
type
()
==
CV_32FC3
);
CV_Assert
(
objPoints
.
type
()
==
CV_32FC3
);
...
@@ -1319,7 +1319,7 @@ Ptr<Board> Board::create(InputArrayOfArrays objPoints, Ptr<Dictionary> &dictiona
...
@@ -1319,7 +1319,7 @@ Ptr<Board> Board::create(InputArrayOfArrays objPoints, Ptr<Dictionary> &dictiona
Ptr
<
Board
>
res
=
makePtr
<
Board
>
();
Ptr
<
Board
>
res
=
makePtr
<
Board
>
();
ids
.
copyTo
(
res
->
ids
);
ids
.
copyTo
(
res
->
ids
);
res
->
objPoints
=
obj_points_vector
;
res
->
objPoints
=
obj_points_vector
;
res
->
dictionary
=
dictionary
;
res
->
dictionary
=
cv
::
makePtr
<
Dictionary
>
(
dictionary
)
;
return
res
;
return
res
;
}
}
...
@@ -1602,7 +1602,7 @@ double calibrateCameraAruco(InputArrayOfArrays _corners, InputArray _ids, InputA
...
@@ -1602,7 +1602,7 @@ double calibrateCameraAruco(InputArrayOfArrays _corners, InputArray _ids, InputA
/**
/**
*/
*/
double
calibrateCameraAruco
(
InputArrayOfArrays
_corners
,
InputArray
_ids
,
InputArray
_counter
,
double
calibrateCameraAruco
(
InputArrayOfArrays
_corners
,
InputArray
_ids
,
InputArray
_counter
,
Ptr
<
Board
>
&
board
,
Size
imageSize
,
InputOutputArray
_cameraMatrix
,
const
Ptr
<
Board
>
&
board
,
Size
imageSize
,
InputOutputArray
_cameraMatrix
,
InputOutputArray
_distCoeffs
,
OutputArrayOfArrays
_rvecs
,
InputOutputArray
_distCoeffs
,
OutputArrayOfArrays
_rvecs
,
OutputArrayOfArrays
_tvecs
,
int
flags
,
TermCriteria
criteria
)
{
OutputArrayOfArrays
_tvecs
,
int
flags
,
TermCriteria
criteria
)
{
return
calibrateCameraAruco
(
_corners
,
_ids
,
_counter
,
board
,
imageSize
,
_cameraMatrix
,
_distCoeffs
,
_rvecs
,
_tvecs
,
return
calibrateCameraAruco
(
_corners
,
_ids
,
_counter
,
board
,
imageSize
,
_cameraMatrix
,
_distCoeffs
,
_rvecs
,
_tvecs
,
...
...
modules/aruco/src/charuco.cpp
View file @
caf7fa97
...
@@ -746,7 +746,7 @@ double calibrateCameraCharuco(InputArrayOfArrays _charucoCorners, InputArrayOfAr
...
@@ -746,7 +746,7 @@ double calibrateCameraCharuco(InputArrayOfArrays _charucoCorners, InputArrayOfAr
/**
/**
*/
*/
double
calibrateCameraCharuco
(
InputArrayOfArrays
_charucoCorners
,
InputArrayOfArrays
_charucoIds
,
double
calibrateCameraCharuco
(
InputArrayOfArrays
_charucoCorners
,
InputArrayOfArrays
_charucoIds
,
Ptr
<
CharucoBoard
>
&
_board
,
Size
imageSize
,
const
Ptr
<
CharucoBoard
>
&
_board
,
Size
imageSize
,
InputOutputArray
_cameraMatrix
,
InputOutputArray
_distCoeffs
,
InputOutputArray
_cameraMatrix
,
InputOutputArray
_distCoeffs
,
OutputArrayOfArrays
_rvecs
,
OutputArrayOfArrays
_tvecs
,
int
flags
,
OutputArrayOfArrays
_rvecs
,
OutputArrayOfArrays
_tvecs
,
int
flags
,
TermCriteria
criteria
)
{
TermCriteria
criteria
)
{
...
...
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