potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-28 23:03:03 +04:00
Code Packages Releases Wiki Activity

Revert commit 994e07db0 (PR #1715), because it's irrelevant for master.

Browse Source 
Conflicts:
	modules/java/generator/src/cpp/VideoCapture.cpp
This commit is contained in:
Roman Donchenko
2013-11-06 12:32:03 +04:00
parent 8f5eaca354
commit 65389e41db
4 changed files with 4 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/java/generator/gen_java.py
+2 -9
View File
@@ -1525,15 +1525,8 @@ if __name__ == "__main__":
hdr_parser_path = os.path.dirname(hdr_parser_path)
sys.path.append(hdr_parser_path)
import hdr_parser
if (sys.argv[2] == "-android"):
class_ignore_list += ("VideoCapture",)
ManualFuncs.pop("VideoCapture")
module = sys.argv[3]
srcfiles = sys.argv[4:]
else:
module = sys.argv[2]
srcfiles = sys.argv[3:]
module = sys.argv[2]
srcfiles = sys.argv[3:]
#print "Generating module '" + module + "' from headers:\n\t" + "\n\t".join(srcfiles)
generator = JavaWrapperGenerator()
generator.gen(srcfiles, module, dstdir)