Changeset 33245

Timestamp:

05/11/09 23:48:51 (4 years ago)

Author:

Matt

Message:

Added all cv macros

Location:

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/Src/Core

Files:

• CvDll.cs (modified) (1 diff)
• Cv_A-C.cs (modified) (6 diffs)

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

@@ -48 +48 @@
         public static extern void cvCalcArrHist(IntPtr[] image, IntPtr hist, [MarshalAs(UnmanagedType.Bool)] bool accumulate, IntPtr mask);
         [DllImport(DLL_CV)]
-        public static extern void cvCalcBackProject(IntPtr[] image, IntPtr back_project, IntPtr hist);
-        [DllImport(DLL_CV)]
-        public static extern void cvCalcBackProjectPatch(IntPtr[] image, IntPtr dst, CvSize patch_size, IntPtr hist, int method, float factor);
+        public static extern void cvCalcArrBackProject(IntPtr[] image, IntPtr back_project, IntPtr hist);
+        [DllImport(DLL_CV)]
+        public static extern void cvCalcArrBackProjectPatch(IntPtr[] image, IntPtr dst, CvSize patch_size, IntPtr hist, int method, float factor);
         [DllImport(DLL_CV)]
         public static extern void cvCalcBayesianProb(IntPtr[] src, int number, IntPtr[] dst);

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/Src/Core/Cv_A-C.cs

@@ -1268 +1268 @@
         }
         #endregion
-        #region CalcBackProject
+        #region CalcArrBackProject
 #if LANG_JP
         /// <summary>
@@ -1286 +1286 @@
         /// <returns></returns>
 #endif
-        public static void CalcBackProject(CvArr[] image, CvArr back_project, CvHistogram hist)
+        public static void CalcArrBackProject(CvArr[] image, CvArr back_project, CvHistogram hist)
         {
             if (image == null)
@@ -1305 +1305 @@
                 image_ptr[i] = image[i].CvPtr;
             }
-            CvDll.cvCalcBackProject(image_ptr, back_project.CvPtr, hist.CvPtr);
-        }
-        #endregion
-        #region CalcBackProjectPatch
+            CvDll.cvCalcArrBackProject(image_ptr, back_project.CvPtr, hist.CvPtr);
+        }
+#if LANG_JP
+        /// <summary>
+        /// バックプロジェクションの計算を行う
+        /// </summary>
+        /// <param name="image">入力画像群</param>
+        /// <param name="back_project">出力のバックプロジェクション画像．入力画像群と同じタイプ．</param>
+        /// <param name="hist">ヒストグラム</param>
+        /// <returns></returns>
+#else
+        /// <summary>
+        /// Calculates back projection
+        /// </summary>
+        /// <param name="image">Source images (though you may pass CvMat** as well), all are of the same size and type </param>
+        /// <param name="back_project">Destination back projection image of the same type as the source images. </param>
+        /// <param name="hist">Histogram. </param>
+        /// <returns></returns>
+#endif
+        public static void CalcBackProject(CvArr[] image, CvArr back_project, CvHistogram hist)
+        {
+            CalcArrBackProject(image, back_project, hist);
+        }
+        #endregion
+        #region CalcArrBackProjectPatch
 #if LANG_JP
         /// <summary>
@@ -1330 +1351 @@
         /// <returns></returns>
 #endif
-        public static void CalcBackProjectPatch(CvArr[] image, CvArr dst, CvSize patch_size, CvHistogram hist, HistogramComparison method)
-        {
-            if (image == null)
-            {
-                throw new ArgumentNullException("image");
-            }
-            if (dst == null)
-            {
-                throw new ArgumentNullException("dst");
-            }
-            if (hist == null)
-            {
-                throw new ArgumentNullException("hist");
-            }
-            IntPtr[] image_ptr = new IntPtr[image.Length];
-            for (int i = 0; i < image.Length; i++)
-            {
-                image_ptr[i] = image[i].CvPtr;
-            }
-            CvDll.cvCalcBackProjectPatch(image_ptr, dst.CvPtr, patch_size, hist.CvPtr, (int)method, 1f);
+        public static void CalcArrBackProjectPatch(CvArr[] image, CvArr dst, CvSize patch_size, CvHistogram hist, HistogramComparison method)
+        {
+            CalcArrBackProjectPatch(image, dst, patch_size, hist, method, 1f);
         }
 #if LANG_JP
@@ -1374 +1378 @@
         /// <returns></returns>
 #endif
-        public static void CalcBackProjectPatch(CvArr[] image, CvArr dst, CvSize patch_size, CvHistogram hist, HistogramComparison method, float factor)
+        public static void CalcArrBackProjectPatch(CvArr[] image, CvArr dst, CvSize patch_size, CvHistogram hist, HistogramComparison method, float factor)
         {
             if (image == null)
@@ -1393 +1397 @@
                 image_ptr[i] = image[i].CvPtr;
             }
-            CvDll.cvCalcBackProjectPatch(image_ptr, dst.CvPtr, patch_size, hist.CvPtr, (int)method, factor);
+            CvDll.cvCalcArrBackProjectPatch(image_ptr, dst.CvPtr, patch_size, hist.CvPtr, (int)method, factor);
+        }
+#if LANG_JP
+        /// <summary>
+        /// ヒストグラムの比較に基づき画像内部でのテンプレート位置を求める
+        /// </summary>
+        /// <param name="image">入力画像群（ CvMat** 形式でも構わない）．すべて同じサイズ．</param>
+        /// <param name="dst">出力画像</param>
+        /// <param name="patch_size">入力画像群上をスライドさせるテンプレートのサイズ</param>
+        /// <param name="hist">テンプレートのヒストグラム</param>
+        /// <param name="method">比較方法．値は関数 cvCompareHist に渡される（この関数に関する記述を参照）</param>
+        /// <returns></returns>
+#else
+        /// <summary>
+        /// Locates a template within image by histogram comparison
+        /// </summary>
+        /// <param name="image">Source images (though you may pass CvMat** as well), all are of the same size and type </param>
+        /// <param name="dst">Destination image. </param>
+        /// <param name="patch_size">Size of patch slid though the source images. </param>
+        /// <param name="hist">Histogram. </param>
+        /// <param name="method">Compasion method, passed to cvCompareHist (see description of that function). </param>
+        /// <returns></returns>
+#endif
+        public static void CalcBackProjectPatch(CvArr[] image, CvArr dst, CvSize patch_size, CvHistogram hist, HistogramComparison method)
+        {
+            CalcArrBackProjectPatch(image, dst, patch_size, hist, method, 1f);
+        }
+#if LANG_JP
+        /// <summary>
+        /// ヒストグラムの比較に基づき画像内部でのテンプレート位置を求める
+        /// </summary>
+        /// <param name="image">入力画像群（ CvMat** 形式でも構わない）．すべて同じサイズ．</param>
+        /// <param name="dst">出力画像</param>
+        /// <param name="patch_size">入力画像群上をスライドさせるテンプレートのサイズ</param>
+        /// <param name="hist">テンプレートのヒストグラム</param>
+        /// <param name="method">比較方法．値は関数 cvCompareHist に渡される（この関数に関する記述を参照）</param>
+        /// <param name="factor">ヒストグラムの正規化係数．出力画像の正規化スケールに影響する．値に確信がない場合は，１にする．</param>
+        /// <returns></returns>
+#else
+        /// <summary>
+        /// Locates a template within image by histogram comparison
+        /// </summary>
+        /// <param name="image">Source images (though you may pass CvMat** as well), all are of the same size and type </param>
+        /// <param name="dst">Destination image. </param>
+        /// <param name="patch_size">Size of patch slid though the source images. </param>
+        /// <param name="hist">Histogram. </param>
+        /// <param name="method">Compasion method, passed to cvCompareHist (see description of that function). </param>
+        /// <param name="factor">Normalization factor for histograms, will affect normalization scale of destination image, pass 1. if unsure. </param>
+        /// <returns></returns>
+#endif
+        public static void CalcBackProjectPatch(CvArr[] image, CvArr dst, CvSize patch_size, CvHistogram hist, HistogramComparison method, float factor)
+        {
+            CalcArrBackProjectPatch(image, dst, patch_size, hist, method, factor);
         }
         #endregion