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
6501d542
Commit
6501d542
authored
Jan 03, 2017
by
utibenkei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug that occurs when module name and inherited class name are same.
parent
dfb348ef
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
6 deletions
+9
-6
gen_java.py
modules/java/generator/gen_java.py
+9
-6
No files found.
modules/java/generator/gen_java.py
View file @
6501d542
...
...
@@ -862,10 +862,13 @@ class ClassInfo(GeneralInfo):
self
.
j_code
=
StringIO
()
self
.
jn_code
=
StringIO
()
self
.
cpp_code
=
StringIO
();
if
self
.
name
!=
Modul
e
:
self
.
j_code
.
write
(
T_JAVA_START_INHERITED
if
self
.
base
else
T_JAVA_START_ORPHAN
)
if
self
.
bas
e
:
self
.
j_code
.
write
(
T_JAVA_START_INHERITED
)
else
:
self
.
j_code
.
write
(
T_JAVA_START_MODULE
)
if
self
.
name
!=
Module
:
self
.
j_code
.
write
(
T_JAVA_START_ORPHAN
)
else
:
self
.
j_code
.
write
(
T_JAVA_START_MODULE
)
# misc handling
if
self
.
name
==
'Core'
:
self
.
imports
.
add
(
"java.lang.String"
)
...
...
@@ -962,11 +965,11 @@ class JavaWrapperGenerator(object):
logging
.
info
(
'ignored:
%
s'
,
classinfo
)
return
name
=
classinfo
.
name
if
self
.
isWrapped
(
name
):
if
self
.
isWrapped
(
name
)
and
not
classinfo
.
base
:
logging
.
warning
(
'duplicated:
%
s'
,
classinfo
)
return
self
.
classes
[
name
]
=
classinfo
if
name
in
type_dict
:
if
name
in
type_dict
and
not
classinfo
.
base
:
logging
.
warning
(
'duplicated:
%
s'
,
classinfo
)
return
type_dict
[
name
]
=
\
...
...
@@ -1520,7 +1523,7 @@ JNIEXPORT $rtype JNICALL Java_org_opencv_${module}_${clazz}_$fname
ci
.
jn_code
.
write
(
ManualFuncs
[
ci
.
name
][
func
][
"jn_code"
]
)
ci
.
cpp_code
.
write
(
ManualFuncs
[
ci
.
name
][
func
][
"cpp_code"
]
)
if
ci
.
name
!=
self
.
Module
:
if
ci
.
name
!=
self
.
Module
or
ci
.
base
:
# finalize()
ci
.
j_code
.
write
(
"""
...
...
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