Java API: updated Mat port

pull/13383/head
Andrey Kamaev 13 years ago
parent c697f6a3f8
commit 5041773f0d
  1. 6
      modules/java/gen_java.py
  2. 2045
      modules/java/src/cpp/Mat.cpp
  3. 1249
      modules/java/src/java/core+Mat.java

@ -85,7 +85,7 @@ const_ignore_list = (
"CV_L?(BGRA?|RGBA?|GRAY|XYZ|YCrCb|Luv|Lab|HLS|YUV|HSV)\d*2L?(BGRA?|RGBA?|GRAY|XYZ|YCrCb|Luv|Lab|HLS|YUV|HSV).*", "CV_L?(BGRA?|RGBA?|GRAY|XYZ|YCrCb|Luv|Lab|HLS|YUV|HSV)\d*2L?(BGRA?|RGBA?|GRAY|XYZ|YCrCb|Luv|Lab|HLS|YUV|HSV).*",
"CV_COLORCVT_MAX", "CV_COLORCVT_MAX",
"CV_.*Bayer.*", "CV_.*Bayer.*",
"CV_YUV420i2.+", "CV_YUV420(i|sp)2.+",
"CV_TM_.+", "CV_TM_.+",
"CV_FLOODFILL_.+", "CV_FLOODFILL_.+",
"CV_ADAPTIVE_THRESH_.+", "CV_ADAPTIVE_THRESH_.+",
@ -616,11 +616,11 @@ public class %(c)s {
if classinfo.name in self.classes: if classinfo.name in self.classes:
print "Generator error: class %s (%s) is duplicated" % \ print "Generator error: class %s (%s) is duplicated" % \
(classinfo.name, classinfo.cname) (classinfo.name, classinfo.cname)
sys.exit(-1) return
self.classes[classinfo.name] = classinfo self.classes[classinfo.name] = classinfo
if classinfo.name in type_dict: if classinfo.name in type_dict:
print "Duplicated class: " + classinfo.name print "Duplicated class: " + classinfo.name
sys.exit(-1) return
type_dict[classinfo.name] = \ type_dict[classinfo.name] = \
{ "j_type" : classinfo.name, { "j_type" : classinfo.name,
"jn_type" : "long", "jn_args" : (("__int64", ".nativeObj"),), "jn_type" : "long", "jn_args" : (("__int64", ".nativeObj"),),

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save