Changeset 32941 for lang/cpluspluscli

Timestamp:

04/29/09 17:27:14 (4 years ago)

Author:

schima

Message:

cvTreeToNodeSeq, cvInsertNodeIntoTree, cvRemoveNodeFromTree

Location:

lang/cpluspluscli/OpenCvSharp2/trunk

Files:

• OpenCvSharp/Src/Core/CvDll.cs (modified) (1 diff)
• OpenCvSharp/Src/Core/Cv_H-Q.cs (modified) (1 diff)
• OpenCvSharp/Src/Core/Cv_R-Z.cs (modified) (2 diffs)
• OpenCvSharp/Src/CvArr/CvSetT.cs (modified) (1 diff)
• wrapped functions.csv (modified) (3 diffs)

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/Src/Core/CvDll.cs

@@ -900 +900 @@
         public static extern void cvTranspose(IntPtr src, IntPtr dst);
         [DllImport(DLL_CXCORE)]
+        public static extern IntPtr cvTreeToNodeSeq(IntPtr first, int header_size, CvMemStorage storage);
+        [DllImport(DLL_CXCORE)]
         public static extern int cvUseOptimized([MarshalAs(UnmanagedType.Bool)] bool on_off);
         [DllImport(DLL_CXCORE)]

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/Src/Core/Cv_H-Q.cs

@@ -1224 +1224 @@
         }
         #endregion
+        #region InsertNodeIntoTree
+#if LANG_JP
+        /// <summary>
+        /// ツリーに新しいノードを追加する
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="node">挿入されるノード．</param>
+        /// <param name="parent">ツリー内に既に存在している親ノード．</param>
+        /// <param name="frame">トップレベルノード．parent と frame が同じである場合， nodeのv_prevフィールドには，parent ではなく，nullがセットされる．</param>
+#else
+        /// <summary>
+        /// Adds new node to the tree
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="node">The inserted node. </param>
+        /// <param name="parent">The parent node that is already in the tree. </param>
+        /// <param name="frame">The top level node. If parent and frame are the same, v_prev  field of node is set to null rather than parent. </param>
+#endif
+        public static void InsertNodeIntoTree<T>(this CvTreeNode<T> node, CvTreeNode<T> parent, CvTreeNode<T> frame)
+            where T : CvTreeNode<T>
+        {
+            if (node == null)
+                throw new ArgumentNullException("node");
+            if (parent == null)
+                throw new ArgumentNullException("parent");
+            if (frame == null)
+                throw new ArgumentNullException("frame");
+            CvDll.cvInsertNodeIntoTree(node.CvPtr, parent.CvPtr, frame.CvPtr);
+        }
+        #endregion
         #region Integral
 #if LANG_JP

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/Src/Core/Cv_R-Z.cs

@@ -1191 +1191 @@
                 throw new ArgumentNullException("mapy");
             CvDll.cvRemap(src.CvPtr, dst.CvPtr, mapx.CvPtr, mapy.CvPtr, flags, fillval);
+        }
+        #endregion
+        #region RemoveNodeFromTree
+#if LANG_JP
+        /// <summary>
+        /// ツリーからノードを削除する
+        /// </summary>
+        /// <param name="node">削除されるノード．</param>
+        /// <param name="frame">トップレベルノード．node->v_prev = null かつ node->h_prev = null （つまり，node が frameの最初の子ノードである）である場合， 
+        /// frame->v_next は node->h_next にセットされる (つまり，最初の子ノードかframeが変更される）．</param>
+#else
+        /// <summary>
+        /// Removes node from tree
+        /// </summary>
+        /// <param name="node">The removed node. </param>
+        /// <param name="frame">The top level node. If node->v_prev = null and node->h_prev is null (i.e. if node is the first child of frame), 
+        /// frame->v_next is set to node->h_next (i.e. the first child or frame is changed). </param>
+#endif
+        public static void RemoveNodeFromTree<T>(this CvTreeNode<T> node, CvTreeNode<T> frame)
+            where T : CvTreeNode<T>
+        {
+            if (node == null)
+                throw new ArgumentNullException("node");
+            if (frame == null)
+                throw new ArgumentNullException("frame");
+            CvDll.cvRemoveNodeFromTree(node.CvPtr, frame.CvPtr);
         }
         #endregion
@@ -5648 +5674 @@
         }
         #endregion
+        #region TreeToNodeSeq
+#if LANG_JP
+        /// <summary>
+        /// すべてのノードへのポインタを一つのシーケンスに集める
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="first">ツリーの先頭ノード．</param>
+        /// <param name="header_size">作成したシーケンスのヘッダサイズ（sizeof(CvSeq) が用いられることが多い）．</param>
+        /// <param name="storage">シーケンスのためのコンテナ．</param>
+        /// <returns></returns>
+#else
+        /// <summary>
+        /// Gathers all node pointers to the single sequence
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="first">The initial tree node. </param>
+        /// <param name="header_size">Header size of the created sequence (sizeof(CvSeq) is the most used value). </param>
+        /// <param name="storage">Container for the sequence. </param>
+        /// <returns></returns>
+#endif
+        public static CvSeq TreeToNodeSeq<T>(this CvTreeNode<T> first, int header_size, CvMemStorage storage)
+            where T : CvTreeNode<T>
+        {
+            if (first == null)
+                throw new ArgumentNullException("first");
+            if (storage == null)
+                throw new ArgumentNullException("storage");
+            IntPtr result = CvDll.cvTreeToNodeSeq(first.CvPtr, header_size, storage);
+            if (result == IntPtr.Zero)
+                return null;
+            else
+                return new CvSeq(result);
+        }
+        #endregion
         #region Undistort2
 #if LANG_JP

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/Src/CvArr/CvSetT.cs

@@ -50 +50 @@
 #endif
         public CvSet(SeqType set_flags, int header_size, int elem_size, CvMemStorage storage)
-            : base(CvDll.cvCreateSet(set_flags, header_size, elem_size, storage.CvPtr))
+            : base(set_flags, header_size, elem_size, storage)
         {
-            if (this._ptr == IntPtr.Zero)
-            {
-                throw new OpenCvSharpException("Failed to create SvSet<T>");
-            }
         }
 #if LANG_JP

lang/cpluspluscli/OpenCvSharp2/trunk/wrapped functions.csv

@@ -286 +286 @@
 InRange;X;
 InRangeS;X;
-InsertNodeIntoTree;;
+InsertNodeIntoTree;X;
 Integral;X;
 Invert;X;
@@ -411 +411 @@
 ReleaseVideoWriter;X;
 Remap;X;
-RemoveNodeFromTree;;
+RemoveNodeFromTree;X;
 Repeat;X;
 ReprojectImageTo3D;X;
@@ -514 +514 @@
 Transform;X;
 Transpose;X;
-TreeToNodeSeq;;
+TreeToNodeSeq;X;
 TypeOf;;
 Undistort2;X;