Update to 2.0.0 tree from current Fremantle build

[opencv] / utils / extract_macros.py

diff --git a/utils/extract_macros.py b/utils/extract_macros.py
index d8e24b8..87bed09 100755 (executable)
--- a/utils/extract_macros.py
+++ b/utils/extract_macros.py
@@ -23,6 +23,7 @@ ARG_MAP = {
     "elem_size":"int",
     "edge":"CvGraphEdge *",
     "vertex":"CvGraphVtx *",
+    "contour":"CvSeq *",
     "vtx":"CvGraphVtx *",
     "reader":"CvSeqReader",
     "writer":"CvSeqWriter",
@@ -75,6 +76,7 @@ ARG_MAP = {
     "factor":"double"
 }
 RET_MAP = {
+    "cvContourPerimeter":"double",
     "CV_RGB":"CvScalar",
     "CV_NEXT_GRAPH_EDGE":"CvGraphEdge *",
     "CV_IMIN":"int",
@@ -108,6 +110,10 @@ print """
 /////////////////////////////////////////////////////////////////////////////////////////////////M*/
 """
 
+print "// This file was generated from the following header files: "
+print "// %s" % "\n// ".join(sys.argv[1:])
+
+
 def determine_return_type(name, arguments):
     if RET_MAP.has_key( name ):
         return RET_MAP[name]