Changeset 32863 for lang/cpluspluscli

Timestamp:

04/27/09 22:51:04 (4 years ago)

Author:

schima

Message:

bugfix : CvContourScanner?

Location:

lang/cpluspluscli/OpenCvSharp2/trunk

Files:

• OpenCvSharp.Test/Program.cs (modified) (1 diff)
• OpenCvSharp/Src/Class/CvContourScanner.cs (modified) (5 diffs)
• OpenCvSharp/Src/Core/Cv_R-Z.cs (modified) (1 diff)
• OpenCvSharp/Src/DisposableCvObject.cs (modified) (3 diffs)

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

@@ -70 +70 @@
             //new Test.Contour();                     // 輪郭領域の面積と輪郭の長さ
 
-            //new Test.ContourScanner();              // CvContourScanner Sample
+            new Test.ContourScanner();              // CvContourScanner Sample
 
             //new Test.ConvertToBitmap();             // System.Drawing.Bitmapへの変換

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

@@ -23 +23 @@
     public class CvContourScanner : DisposableCvObject, IEnumerable<CvSeq<CvPoint>>
     {
+        #region Fields
+        private CvArr _image;
+        private CvMemStorage _storage;
+        private int _header_size;
+        private ContourRetrieval _mode;
+        private ContourChain _method;
+        private CvPoint _offset;
+        #endregion
+
+
         #region Constructors
-        /// <summary>
-        /// Initialize from pointer
-        /// </summary>
-        /// <param name="ptr"></param>
-        public CvContourScanner(IntPtr ptr)
-        {
-            this._ptr = ptr;
-        }
-
 #if LANG_JP
         /// <summary>
@@ -142 +143 @@
             if (storage == null)
                 throw new ArgumentNullException("storage");
+            Initialize(image, storage, header_size, mode, method, offset);
+        }
+
+        /// <summary>
+        /// Initializes contour scanning process
+        /// </summary>
+        /// <param name="image">The source 8-bit single channel binary image. </param>
+        /// <param name="storage">Container of the retrieved contours.</param>
+        /// <param name="header_size">Size of the sequence header, >=sizeof(CvChain) if method=CV_CHAIN_CODE, and >=sizeof(CvContour) otherwise. </param>
+        /// <param name="mode">Retrieval mode; see cvFindContours. </param>
+        /// <param name="method">Approximation method. It has the same meaning as in cvFindContours, but CV_LINK_RUNS can not be used here. </param>
+        /// <param name="offset">ROI offset; see cvFindContours. </param>
+        /// <returns>CvContourScanner</returns>
+        private void Initialize(CvArr image, CvMemStorage storage, int header_size, ContourRetrieval mode, ContourChain method, CvPoint offset)
+        {
+            this._image = image;
+            this._storage = storage;
+            this._header_size = header_size;
+            this._mode = mode;
+            this._method = method;
+            this._offset = offset;
+            if (this._ptr != IntPtr.Zero)
+            {
+                CvDll.cvEndFindContours(ref this._ptr);
+            }
             this._ptr = CvDll.cvStartFindContours(image.CvPtr, storage.CvPtr, header_size, mode, method, offset);
+        }
+        /// <summary>
+        /// Initializes contour scanning process
+        /// </summary>
+        private void Initialize()
+        {
+            Initialize(_image, _storage, _header_size, _mode, _method, _offset);
         }
 
@@ -264 +297 @@
 
         /// <summary>
-        /// = cvEndFindContours
+        /// cvEndFindContours
         /// </summary>
         public override void Dispose()
@@ -278 +311 @@
         #region IEnumerable<CvSeq<CvPoint>>
         /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
+        /// Returns an enumerator that iterates through the collection.
+        /// </summary>
+        /// <returns> A System.Collections.Generic.IEnumerator&lt;T&gt; that can be used to iterate through the collection.</returns>
         public IEnumerator<CvSeq<CvPoint>> GetEnumerator()
         {
+            Initialize();
             while (true)
             {
@@ -293 +327 @@
             Cv.EndFindContours(this);
         }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
         System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
         {

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

@@ -4302 +4302 @@
                 throw new ArgumentNullException("storage");
 
-            IntPtr result = CvDll.cvStartFindContours(image.CvPtr, storage.CvPtr, header_size, mode, method, offset);
-
-            if (result == IntPtr.Zero)
-                return null;
-            else
-                return new CvContourScanner(result);
+            return new CvContourScanner(image, storage, header_size, mode, method, offset);
         }
         #endregion

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/Src/DisposableCvObject.cs

@@ -34 +34 @@
 #endif
         protected DisposableCvObject()
-            : base()
+            : this(true)
         {
         }
@@ -49 +49 @@
 #endif
         protected DisposableCvObject(IntPtr ptr)
-            : base()
+            : this(ptr, true)
         {
-            this._ptr = ptr;
         }
 #if LANG_JP
@@ -67 +66 @@
             : base(isEnabledDispose)
         {
+            this._ptr = IntPtr.Zero;
         }
 #if LANG_JP