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
29b3f665
Commit
29b3f665
authored
May 29, 2019
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #14606 from asashour:java_inline_return
parents
0d477d73
ca8a1d2c
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
12 deletions
+6
-12
core+KeyPoint.java
modules/core/misc/java/src/java/core+KeyPoint.java
+6
-12
core+Mat.java
modules/core/misc/java/src/java/core+Mat.java
+0
-0
gen_java.py
modules/java/generator/gen_java.py
+0
-0
No files found.
modules/core/misc/java/src/java/core+KeyPoint.java
View file @
29b3f665
...
@@ -33,8 +33,7 @@ public class KeyPoint {
...
@@ -33,8 +33,7 @@ public class KeyPoint {
public
int
class_id
;
public
int
class_id
;
// javadoc:KeyPoint::KeyPoint(x,y,_size,_angle,_response,_octave,_class_id)
// javadoc:KeyPoint::KeyPoint(x,y,_size,_angle,_response,_octave,_class_id)
public
KeyPoint
(
float
x
,
float
y
,
float
_size
,
float
_angle
,
float
_response
,
int
_octave
,
int
_class_id
)
public
KeyPoint
(
float
x
,
float
y
,
float
_size
,
float
_angle
,
float
_response
,
int
_octave
,
int
_class_id
)
{
{
pt
=
new
Point
(
x
,
y
);
pt
=
new
Point
(
x
,
y
);
size
=
_size
;
size
=
_size
;
angle
=
_angle
;
angle
=
_angle
;
...
@@ -44,32 +43,27 @@ public class KeyPoint {
...
@@ -44,32 +43,27 @@ public class KeyPoint {
}
}
// javadoc: KeyPoint::KeyPoint()
// javadoc: KeyPoint::KeyPoint()
public
KeyPoint
()
public
KeyPoint
()
{
{
this
(
0
,
0
,
0
,
-
1
,
0
,
0
,
-
1
);
this
(
0
,
0
,
0
,
-
1
,
0
,
0
,
-
1
);
}
}
// javadoc: KeyPoint::KeyPoint(x, y, _size, _angle, _response, _octave)
// javadoc: KeyPoint::KeyPoint(x, y, _size, _angle, _response, _octave)
public
KeyPoint
(
float
x
,
float
y
,
float
_size
,
float
_angle
,
float
_response
,
int
_octave
)
public
KeyPoint
(
float
x
,
float
y
,
float
_size
,
float
_angle
,
float
_response
,
int
_octave
)
{
{
this
(
x
,
y
,
_size
,
_angle
,
_response
,
_octave
,
-
1
);
this
(
x
,
y
,
_size
,
_angle
,
_response
,
_octave
,
-
1
);
}
}
// javadoc: KeyPoint::KeyPoint(x, y, _size, _angle, _response)
// javadoc: KeyPoint::KeyPoint(x, y, _size, _angle, _response)
public
KeyPoint
(
float
x
,
float
y
,
float
_size
,
float
_angle
,
float
_response
)
public
KeyPoint
(
float
x
,
float
y
,
float
_size
,
float
_angle
,
float
_response
)
{
{
this
(
x
,
y
,
_size
,
_angle
,
_response
,
0
,
-
1
);
this
(
x
,
y
,
_size
,
_angle
,
_response
,
0
,
-
1
);
}
}
// javadoc: KeyPoint::KeyPoint(x, y, _size, _angle)
// javadoc: KeyPoint::KeyPoint(x, y, _size, _angle)
public
KeyPoint
(
float
x
,
float
y
,
float
_size
,
float
_angle
)
public
KeyPoint
(
float
x
,
float
y
,
float
_size
,
float
_angle
)
{
{
this
(
x
,
y
,
_size
,
_angle
,
0
,
0
,
-
1
);
this
(
x
,
y
,
_size
,
_angle
,
0
,
0
,
-
1
);
}
}
// javadoc: KeyPoint::KeyPoint(x, y, _size)
// javadoc: KeyPoint::KeyPoint(x, y, _size)
public
KeyPoint
(
float
x
,
float
y
,
float
_size
)
public
KeyPoint
(
float
x
,
float
y
,
float
_size
)
{
{
this
(
x
,
y
,
_size
,
-
1
,
0
,
0
,
-
1
);
this
(
x
,
y
,
_size
,
-
1
,
0
,
0
,
-
1
);
}
}
...
...
modules/core/misc/java/src/java/core+Mat.java
View file @
29b3f665
This diff is collapsed.
Click to expand it.
modules/java/generator/gen_java.py
View file @
29b3f665
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