Changeset 31851 for lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/HighGUI/CvWindow.cs

Timestamp:

04/03/09 14:24:41 (4 years ago)

Author:

schima

Message:

measures of GC

Files:

• lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/HighGUI/CvWindow.cs (modified) (6 diffs)

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/HighGUI/CvWindow.cs

@@ -19 +19 @@
                 private CvMouseCallbackHandler mouseCallback;
                 private Dictionary<string, CvTrackbar> trackbars;
+        private ScopedGCHandle callbackHandle;
 
         #region 初期化と解放
@@ -96 +97 @@
                 Windows.Add(name, this);
             }
+            this.callbackHandle = null;
         }
         /// <summary>
@@ -132 +134 @@
                     Windows.Remove(name);
                 }
-                catch (Exception) { }                
+                catch (Exception) { }
+                if (callbackHandle != null && callbackHandle.IsAllocated)
+                {
+                    callbackHandle.Dispose();
+                }
             }
             base.Dispose();
@@ -184 +190 @@
             get { return CvDll.cvGetWindowHandle(name); }
         }
+        /// <summary>
+                /// マウスイベントが発生したときのイベントハンドラ
+                /// </summary>
+        internal CvMouseCallbackHandler MouseCallback
+        {
+            get { return mouseCallback; }
+            set
+            {
+                if (callbackHandle != null && callbackHandle.IsAllocated)
+                {
+                    callbackHandle.Dispose();
+                }
+                mouseCallback = value;
+                callbackHandle = new ScopedGCHandle(mouseCallback, GCHandleType.Normal);
+            }
+        }
         /// <summary>
                 /// マウスイベントが発生したときのイベントハンドラ
@@ -189 +211 @@
                 public event CvMouseCallbackHandler OnMouseCallback{
                         add{
+                if (callbackHandle != null && callbackHandle.IsAllocated)
+                {
+                    callbackHandle.Dispose();
+                }
                                 mouseCallback += value;
+                callbackHandle = new ScopedGCHandle(mouseCallback, GCHandleType.Normal);
                 CvDll.cvSetMouseCallback(name, mouseCallback);
                         }
                         remove{
-                                mouseCallback -= value;
+                if (callbackHandle != null && callbackHandle.IsAllocated)
+                {
+                    callbackHandle.Dispose();
+                }
+                mouseCallback -= value;
+                callbackHandle = new ScopedGCHandle(mouseCallback, GCHandleType.Normal);
                                 CvDll.cvSetMouseCallback(name, mouseCallback);
                         }
@@ -317 +349 @@
                     }
             }
+
+        /// <summary>
+        /// 指定した名前に対応するウィンドウを得る
+        /// </summary>
+        /// <param name="name"></param>
+        static public CvWindow GetWindowByName(string name)
+        {
+            if (string.IsNullOrEmpty(name))
+            {
+                throw new ArgumentNullException("name");
+            }
+            if (Windows.ContainsKey(name))
+            {
+                return Windows[name];
+            }
+            else
+            {
+                return null;
+            }
+        }
         #endregion
     }