generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added option to automatically move constants to private list

Browse Source
This commit is contained in:
Andrey Kamaev 2011-07-22 04:54:19 +00:00
parent 078eae7154
commit bba5653bf0
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
modules/java/gen_java.py
View File

@ -86,6 +86,16 @@ const_ignore_list = (
"CV_YUV420i2.+", "CV_YUV420i2.+",
"CV_TM_.+", "CV_TM_.+",
"CV_FLOODFILL_.+", "CV_FLOODFILL_.+",
"CV_ADAPTIVE_THRESH_.+",
)
const_private_list = (
"CV_MOP_.+",
"CV_INTER_.+",
"CV_THRESH_.+",
"CV_INPAINT_.+",
"CV_RETR_.+",
"CV_CHAIN_APPROX_.+",
) )
# { Module : { public : [[name, val],...], private : [[]...] } } # { Module : { public : [[name, val],...], private : [[]...] } }
@ -118,7 +128,7 @@ missing_consts = \
"Calib3d": "Calib3d":
{ {
'public' : 'private' :
( (
('CV_LMEDS', 4), ('CV_LMEDS', 4),
('CV_RANSAC', 8), ('CV_RANSAC', 8),
@ -435,10 +445,11 @@ JNIEXPORT jdoubleArray JNICALL Java_org_opencv_core_Core_n_1getTextSize
} }
class ConstInfo(object): class ConstInfo(object):
def __init__(self, cname, name, val): def __init__(self, cname, name, val, addedManually=False):
self.cname = cname self.cname = cname
self.name = re.sub(r"^Cv", "", name) self.name = re.sub(r"^Cv", "", name)
self.value = val self.value = val
self.addedManually = addedManually
class ClassPropInfo(object): class ClassPropInfo(object):
@ -591,17 +602,17 @@ public class %s {
if classinfo.name in missing_consts: if classinfo.name in missing_consts:
if 'private' in missing_consts[classinfo.name]: if 'private' in missing_consts[classinfo.name]:
for (name, val) in missing_consts[classinfo.name]['private']: for (name, val) in missing_consts[classinfo.name]['private']:
classinfo.private_consts.append( ConstInfo(name, name, val) ) classinfo.private_consts.append( ConstInfo(name, name, val, True) )
if 'public' in missing_consts[classinfo.name]: if 'public' in missing_consts[classinfo.name]:
for (name, val) in missing_consts[classinfo.name]['public']: for (name, val) in missing_consts[classinfo.name]['public']:
classinfo.consts.append( ConstInfo(name, name, val) ) classinfo.consts.append( ConstInfo(name, name, val, True) )
# class props # class props
for p in decl[3]: for p in decl[3]:
if "vector" not in p[0]: if "vector" not in p[0]:
classinfo.props.append( ClassPropInfo(p) ) classinfo.props.append( ClassPropInfo(p) )
else: else:
print "Skipped proprty: [%s]" % classinfo.name, p print "Skipped property: [%s]" % classinfo.name, p
self.add_class_code_stream(classinfo.name) self.add_class_code_stream(classinfo.name)
@ -624,14 +635,24 @@ public class %s {
# this class isn't wrapped # this class isn't wrapped
# skipping this const # skipping this const
return return
consts = self.classes[classname].consts consts = self.classes[classname].consts
for c in const_private_list:
if re.match(c, name):
consts = self.classes[classname].private_consts
break
constinfo = ConstInfo(cname, name, decl[1]) constinfo = ConstInfo(cname, name, decl[1])
# checking duplication # checking duplication
for c in consts: for list in self.classes[classname].consts, self.classes[classname].private_consts:
for c in list:
if c.name == constinfo.name: if c.name == constinfo.name:
if c.addedManually:
return
print "Generator error: constant %s (%s) is duplicated" \ print "Generator error: constant %s (%s) is duplicated" \
% (constinfo.name, constinfo.cname) % (constinfo.name, constinfo.cname)
sys.exit(-1) sys.exit(-1)
consts.append(constinfo) consts.append(constinfo)
def add_func(self, decl): def add_func(self, decl):