Changeset 32785

Timestamp:

04/24/09 21:48:19 (4 years ago)

Author:

schima

Message:

CV_NODE_VAL, CV_NODE_IDX

Location:

lang/cpluspluscli/OpenCvSharp2/trunk

Files:

• OpenCvSharp.Extern/CvInline.h (modified) (1 diff)
• OpenCvSharp/Src/Core/Cv_Macro.cs (modified) (3 diffs)
• OpenCvSharp/Src/CvArr/CvSparseMat.cs (modified) (1 diff)

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Extern/CvInline.h

@@ -357 +357 @@
                                         return IntPtr( ::cvGetNextSparseNode(mat_iterator_ptr) );
                                 }
+
+                                static IntPtr CV_NODE_VAL_( IntPtr mat, IntPtr node )
+                                {
+                                        CvSparseMat* mat_ptr = reinterpret_cast<CvSparseMat*>(mat.ToPointer());
+                                        CvSparseNode* node_ptr = reinterpret_cast<CvSparseNode*>(node.ToPointer());
+                                        return IntPtr( CV_NODE_VAL(mat_ptr, node_ptr) );
+                                }
+                                static IntPtr CV_NODE_IDX_( IntPtr mat, IntPtr node )
+                                {
+                                        CvSparseMat* mat_ptr = reinterpret_cast<CvSparseMat*>(mat.ToPointer());
+                                        CvSparseNode* node_ptr = reinterpret_cast<CvSparseNode*>(node.ToPointer());
+                                        return IntPtr( CV_NODE_IDX(mat_ptr, node_ptr) );
+                                }
                         };
                 }

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

@@ -134 +134 @@
         }
         #endregion
-        #region RGB
-        /// <summary>
-        /// カラー値を作成する
-        /// </summary>
-        /// <param name="r"></param>
-        /// <param name="g"></param>
-        /// <param name="b"></param>
-        /// <returns></returns>
-        public static CvColor RGB(byte r, byte g, byte b)
-        {
-            return new CvColor(r, g, b);
-        }
-        #endregion
+
         #region IS_SET_ELEM
         /// <summary>
@@ -265 +253 @@
         }
         #endregion
+        #region NODE_IDX
+#if LANG_JP
+        /// <summary>
+        /// CV_NODE_IDX
+        /// </summary>
+        /// <param name="mat"></param>
+        /// <param name="node"></param>
+        /// <returns></returns>
+#else
+        /// <summary>
+        /// CV_NODE_IDX
+        /// </summary>
+        /// <param name="mat"></param>
+        /// <param name="node"></param>
+        /// <returns></returns>
+#endif
+        public static PointerAccessor.Int32 NODE_IDX(CvSparseMat mat, CvSparseNode node)
+        {
+            if (mat == null)
+                throw new ArgumentNullException("mat");
+            if (node == null)
+                throw new ArgumentNullException("node");
+            IntPtr result = CvInline.CV_NODE_VAL_(mat.CvPtr, node.CvPtr);
+            return new PointerAccessor.Int32(result);
+        }
+        #endregion
+        #region NODE_VAL
+#if LANG_JP
+        /// <summary>
+        /// CV_NODE_VAL
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="mat"></param>
+        /// <param name="node"></param>
+        /// <returns></returns>
+#else
+        /// <summary>
+        /// CV_NODE_VAL
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="mat"></param>
+        /// <param name="node"></param>
+        /// <returns></returns>
+#endif
+        public static T NODE_VAL<T>(CvSparseMat mat, CvSparseNode node) where T : struct
+        {
+            if (mat == null)
+                throw new ArgumentNullException("mat");
+            if (node == null)
+                throw new ArgumentNullException("node");
+            IntPtr result = CvInline.CV_NODE_VAL_(mat.CvPtr, node.CvPtr);
+            return ToStruct<T>(result);
+        }
+        #endregion
         #region PREV_SEQ_ELEM
         /// <summary>
@@ -328 +370 @@
                 elem = elemPtr.ToStructure();
             }
+        }
+        #endregion
+        #region RGB
+        /// <summary>
+        /// カラー値を作成する
+        /// </summary>
+        /// <param name="r"></param>
+        /// <param name="g"></param>
+        /// <param name="b"></param>
+        /// <returns></returns>
+        public static CvColor RGB(byte r, byte g, byte b)
+        {
+            return new CvColor(r, g, b);
         }
         #endregion

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

@@ -249 +249 @@
         }
         #endregion
+        #region NodeIdx
+#if LANG_JP
+        /// <summary>
+        /// CV_NODE_IDX
+        /// </summary>
+        /// <param name="node"></param>
+        /// <returns></returns>
+#else
+        /// <summary>
+        /// CV_NODE_IDX
+        /// </summary>
+        /// <param name="node"></param>
+        /// <returns></returns>
+#endif
+        public PointerAccessor.Int32 NodeIdx(CvSparseNode node)
+        {
+            return Cv.NODE_IDX(this, node);
+        }
+        #endregion
+        #region NodeVal
+#if LANG_JP
+        /// <summary>
+        /// CV_NODE_VAL
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="node"></param>
+        /// <returns></returns>
+#else
+        /// <summary>
+        /// CV_NODE_VAL
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="node"></param>
+        /// <returns></returns>
+#endif
+        public T NodeVal<T>(CvSparseNode node) where T : struct
+        {
+            return Cv.NODE_VAL<T>(this, node);
+        }
+        #endregion
         #endregion
     }