Changeset 32668 for lang/cpluspluscli

Timestamp:

04/21/09 00:17:07 (4 years ago)

Author:

schima

Message:

CvHaarFeature?, CvHaarClassifier?, CvHaarStageClassifier?, CvHaarClassifierCascade?

Location:

lang/cpluspluscli/OpenCvSharp2/trunk

Files:

• OpenCvSharp.Extern/CvConst.h (modified) (1 diff)
• OpenCvSharp.Extern/OpenCvSharp.Extern.vcproj (modified) (3 diffs)
• OpenCvSharp.Extern/WCvHaarClassifier.cpp (added)
• OpenCvSharp.Extern/WCvHaarClassifier.h (added)
• OpenCvSharp.Extern/WCvHaarClassifierCascade.h (modified) (2 diffs)
• OpenCvSharp.Extern/WCvHaarFeature.cpp (added)
• OpenCvSharp.Extern/WCvHaarFeature.h (added)
• OpenCvSharp.Extern/WCvHaarStageClassifier.cpp (added)
• OpenCvSharp.Extern/WCvHaarStageClassifier.h (added)
• OpenCvSharp.Test/Program.cs (modified) (1 diff)
• OpenCvSharp.Test/Samples/SURF.cs (modified) (2 diffs)
• OpenCvSharp/OpenCvSharp.csproj (modified) (2 diffs)
• OpenCvSharp/Src/Class/CvHaarClassifier.cs (added)
• OpenCvSharp/Src/Class/CvHaarClassifierCascade.cs (modified) (6 diffs)
• OpenCvSharp/Src/Class/CvHaarFeature.cs (added)
• OpenCvSharp/Src/Class/CvHaarStageClassifier.cs (added)

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

@@ -342 +342 @@
                                 literal Int32 CV_HAAR_FIND_BIGGEST_OBJECT_ = CV_HAAR_FIND_BIGGEST_OBJECT;
                                 literal Int32 CV_HAAR_DO_ROUGH_SEARCH_ = CV_HAAR_DO_ROUGH_SEARCH;
+                                // CvHaarFeature
+                                literal Int32 CV_HAAR_FEATURE_MAX_ = CV_HAAR_FEATURE_MAX;
                                 // CvHistogram
                                 literal Int32 CV_HIST_ARRAY_ = CV_HIST_ARRAY;

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Extern/OpenCvSharp.Extern.vcproj

@@ -511 +511 @@
                                 </File>
                                 <File
+                                        RelativePath=".\WCvHaarClassifier.cpp"
+                                        >
+                                </File>
+                                <File
                                         RelativePath=".\WCvHaarClassifierCascade.cpp"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath=".\WCvHaarFeature.cpp"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath=".\WCvHaarStageClassifier.cpp"
                                         >
                                 </File>
@@ -633 +645 @@
                                 >
                         </File>
+                        <File
+                                RelativePath=".\WCvHaarFeature.h"
+                                >
+                        </File>
                         <Filter
                                 Name="Class"
@@ -669 +685 @@
                                 </File>
                                 <File
+                                        RelativePath=".\WCvHaarClassifier.h"
+                                        >
+                                </File>
+                                <File
                                         RelativePath=".\WCvHaarClassifierCascade.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath=".\WCvHaarStageClassifier.h"
                                         >
                                 </File>

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

@@ -46 +46 @@
                 {
                         int get(){ return _ptr->flags; }
-                };
+                }
                 property int count
                 {
@@ -67 +67 @@
                         IntPtr get(){ return IntPtr(_ptr->stage_classifier); }
                 }
+                IntPtr stage_classifier_at(int index)
+                {
+                        return IntPtr(&(_ptr->stage_classifier[index])); 
+                }
                 property IntPtr hid_cascade
                 {

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Test/Program.cs

@@ -55 +55 @@
         static void Main()
         {
+            CvRect rect = new CvRect(10, 20, 30, 40);
+            IntPtr ptr = Marshal.AllocHGlobal(CvRect.SizeOf);
+            Marshal.StructureToPtr(rect, ptr, false);
+            int widthOffset = Marshal.OffsetOf(typeof(CvRect), "Width").ToInt32();
+
+            Stopwatch watch = new Stopwatch();
+
+            watch.Start();
+            for (int i = 0; i < 10000; i++)
+            {
+                int width = rect.Width;
+            }
+            watch.Stop();
+            Console.WriteLine(watch.ElapsedTicks);
+            watch.Reset();
+            watch.Start();
+            for (int i = 0; i < 10000; i++)
+            {
+                int width = Marshal.ReadInt32(ptr, widthOffset);
+            }
+            watch.Stop();
+            Console.WriteLine(watch.ElapsedTicks);
+            watch.Reset();
+            watch.Start();
+            for (int i = 0; i < 10000; i++)
+            {
+                int width = ((CvRect)Marshal.PtrToStructure(ptr, typeof(CvRect))).Width;
+            }
+            watch.Stop();
+            Console.WriteLine(watch.ElapsedTicks);
+            Console.Read();
+
             //new Test.Affine();                      // 画像のアフィン変換  
 

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Test/Samples/SURF.cs

@@ -46 +46 @@
                 watch.Stop();
                 Console.WriteLine("Extraction time = {0}ms", watch.ElapsedMilliseconds);
+                watch.Reset();
+                watch.Start();
 
                 // シーン画像にある局所画像の領域を線で囲む
@@ -79 +81 @@
                     Cv.Circle(objColor, center, radius, CvColor.Red, 1, LineType.AntiAlias, 0);
                 }
+                watch.Stop();
+                Console.WriteLine("Drawing time = {0}ms", watch.ElapsedMilliseconds);
 
                 // ウィンドウに表示

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/OpenCvSharp.csproj

@@ -4 +4 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4C2356B8-1A1E-4F92-A51C-A49CA116867F}</ProjectGuid>
@@ -146 +146 @@
     <Compile Include="Src\Class\CvGraphScanner.cs" />
     <Compile Include="Src\Class\CvGraphVtx.cs" />
+    <Compile Include="Src\Class\CvHaarClassifier.cs" />
+    <Compile Include="Src\Class\CvHaarFeature.cs" />
+    <Compile Include="Src\Class\CvHaarStageClassifier.cs" />
     <Compile Include="Src\Class\CvHuMoments.cs" />
     <Compile Include="Src\Class\CvLineIterator.cs" />

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/Src/Class/CvHaarClassifierCascade.cs

@@ -6 +6 @@
 namespace KwsmLab.OpenCvSharp
 {
+#if LANG_JP
     /// <summary>
     /// 段階分類器のカスケードまたは木
     /// </summary>
+#else
+    /// <summary>
+    /// Cascade or tree of stage classifiers
+    /// </summary>
+#endif
     public class CvHaarClassifierCascade : DisposableObject, ICvPtrHolder
     {
         /// <summary>
-        /// C++/CLI側でポインタにアクセスするオブジェクト
-        /// </summary>
-        private Extern.WCvHaarClassifierCascade data;
-        /// <summary>
-        /// データポインタ
-        /// </summary>
-        private IntPtr ptr;
-
-
-        #region 初期化と解放
+        /// C++/CLI wrapper of data pointer
+        /// </summary>
+        private Extern.WCvHaarClassifierCascade _data;
+        /// <summary>
+        /// Data pointer
+        /// </summary>
+        private IntPtr _ptr;
+
+
+        #region Init and Disposal
+#if LANG_JP
         /// <summary>
         /// ポインタで初期化
         /// </summary>
         /// <param name="ptr">struct CvHaarClassifierCascade*</param>
+#else
+        /// <summary>
+        /// Initializes from native pointer
+        /// </summary>
+        /// <param name="ptr"></param>
+#endif
         public CvHaarClassifierCascade(IntPtr ptr)
             : this(ptr, true)
@@ -35 +48 @@
         /// <param name="ptr">struct CvHaarClassifierCascade*</param>
         /// <param name="isEnabledDispose">自動的にGCで解放してよいかどうか</param>
-        public CvHaarClassifierCascade(IntPtr ptr, bool isEnabledDispose)
+        internal CvHaarClassifierCascade(IntPtr ptr, bool isEnabledDispose)
             : base(isEnabledDispose)
         {
@@ -42 +55 @@
                 throw new OpenCvSharpException("CvHaarClassifierCascadeの生成に失敗しました。");
             }
-            this.ptr = ptr;
-            this.data = new Extern.WCvHaarClassifierCascade(ptr);
-        }
-        
+            this._ptr = ptr;
+            this._data = new Extern.WCvHaarClassifierCascade(ptr);
+        }
+#if LANG_JP
             /// <summary>
             /// ファイルからHaar分類機のカスケードを読み込んで返す (cvLoad相当).
@@ -51 +64 @@
             /// <param name="filename">読み込むファイル(xml/yaml)</param>
             /// <returns>CvHaarClassifierCascade</returns>
+#else
+        /// <summary>
+        /// Loads object from file
+        /// </summary>
+        /// <param name="filename">File name (xml/yaml)</param>
+        /// <returns></returns>
+#endif
             public static CvHaarClassifierCascade FromFile( string filename )
             {
@@ -60 +80 @@
             }
 
-        /// <summary>
-        /// リソースの解放
-        /// </summary>
+#if LANG_JP
+        /// <summary>
+        /// リソースの解放 (cvReleaseHaarClassifierCascade)
+        /// </summary>
+#else
+        /// <summary>
+        /// Releases using cvReleaseHaarClassifierCascade
+        /// </summary>
+#endif
         public override void Dispose()
         {
             if (IsEnabledDispose && !IsDisposed)
             {
-                CvDll.cvReleaseHaarClassifierCascade(ref ptr);                
+                CvDll.cvReleaseHaarClassifierCascade(ref _ptr);                
             }
             base.Dispose();
@@ -74 +100 @@
 
 
-        #region プロパティ
-        /// <summary>
-        /// データポインタ (CvMemStorage*)
+        #region Properties
+        /// <summary>
+        /// Data pointer (CvHaarClassifierCascade*)
         /// </summary>
         public IntPtr CvPtr
         {
-            get { return ptr; }
-        }
-        /// <summary>
-        /// sizeof(WCvMemStorage) を取得する
-        /// </summary>
-        public const Int32 SizeOf = Extern.WCvMemStorage.SizeOf;
-
-
+            get { return _ptr; }
+        }
+        /// <summary>
+        /// sizeof(CvHaarClassifierCascade) 
+        /// </summary>
+        public const Int32 SizeOf = Extern.WCvHaarClassifierCascade.SizeOf;
+
+
+#if LANG_JP
         /// <summary>
         /// シグネチャ
         /// </summary>
+#else
+        /// <summary>
+        /// Signature 
+        /// </summary>
+#endif
         public int Flags
         {
-            get { return data.flags; }
-        }
+            get { return _data.flags; }
+        }
+#if LANG_JP
         /// <summary>
         /// 段階数
         /// </summary>
+#else
+        /// <summary>
+        /// Number of stages
+        /// </summary>
+#endif
         public int Count
         {
-            get { return data.count; }
-        }
+            get { return _data.count; }
+        }
+#if LANG_JP
         /// <summary>
         /// オリジナルのオブジェクトサイズ（カスケードの学習対象）
         /// </summary>
+#else
+        /// <summary>
+        /// Original object size (the cascade is trained for)
+        /// </summary>
+#endif
         public CvSize OrigWindowSize
         {
-            get { return data.orig_window_size; }
-        }
+            get { return _data.orig_window_size; }
+        }
+#if LANG_JP
         /// <summary>
         /// 現在のオブジェクトサイズ
         /// </summary>
+#else
+        /// <summary>
+        /// Current object size
+        /// </summary>
+#endif
         public CvSize RealWindowSize
         {
-            get { return data.real_window_size; }
-        }
+            get { return _data.real_window_size; }
+        }
+#if LANG_JP
         /// <summary>
         /// 現在のスケール
         /// </summary>
+#else
+        /// <summary>
+        /// Current scale
+        /// </summary>
+#endif
         public double Scale
         {
-            get { return data.scale; }
-        }
+            get { return _data.scale; }
+        }
+#if LANG_JP
         /// <summary>
         /// 段階分類器の配列
         /// </summary>
-        public IntPtr StageClassifier
+#else
+        /// <summary>
+        /// Array of stage classifiers
+        /// </summary>
+#endif
+        public CvHaarStageClassifier[] StageClassifier
         {
             get
             {
-                return data.stage_classifier;
+                int length = _data.count;
+                CvHaarStageClassifier[] result = new CvHaarStageClassifier[length];
+                for (int i = 0; i < length; i++)
+                {
+                    result[i] = new CvHaarStageClassifier(_data.stage_classifier_at(i));
+                }
+                return result;
             }
         }
+#if LANG_JP
         /// <summary>
         /// cvSetImagesForHaarClassifierCascade によって生成されるカスケードの，隠れ最適表現
         /// </summary>
+#else
+        /// <summary>
+        /// Hidden optimized representation of the cascade, created by cvSetImagesForHaarClassifierCascade
+        /// </summary>
+#endif
         public IntPtr HidCascade
         {
-            get { return data.hid_cascade; }
+            get { return _data.hid_cascade; }
         }