cv::Ptr<T> bugfix

shimat · Nov 5, 2016 · 3aa0c61 · 3aa0c61
1 parent 6a83bed
commit 3aa0c61
Show file tree

Hide file tree

Showing 17 changed files with 37 additions and 6 deletions.
diff --git a/src/OpenCvSharp/modules/features2d/AKAZE.cs b/src/OpenCvSharp/modules/features2d/AKAZE.cs
@@ -26,6 +26,8 @@ public class AKAZE : Feature2D
         private bool disposed;
         private Ptr<AKAZE> ptrObj;
 
+        internal override IntPtr PtrObj => ptrObj.CvPtr;
+
         #region Init & Disposal
 
         /// <summary>

diff --git a/src/OpenCvSharp/modules/features2d/AgastFeatureDetector.cs b/src/OpenCvSharp/modules/features2d/AgastFeatureDetector.cs
@@ -16,7 +16,9 @@ namespace OpenCvSharp
     public class AgastFeatureDetector : Feature2D
     {
         private bool disposed;
-        private Ptr<AgastFeatureDetector> ptrObj;
+        internal Ptr<AgastFeatureDetector> ptrObj;
+
+        internal override IntPtr PtrObj => ptrObj.CvPtr;
 
 #pragma warning disable 1591
         public const int

diff --git a/src/OpenCvSharp/modules/features2d/BFMatcher.cs b/src/OpenCvSharp/modules/features2d/BFMatcher.cs
@@ -13,6 +13,8 @@ public class BFMatcher : DescriptorMatcher
         private bool disposed;
         private Ptr<BFMatcher> detectorPtr;
 
+        internal override IntPtr PtrObj => detectorPtr.CvPtr;
+
         #region Init & Disposal
 
         /// <summary>

diff --git a/src/OpenCvSharp/modules/features2d/BOWImgDescriptorExtractor.cs b/src/OpenCvSharp/modules/features2d/BOWImgDescriptorExtractor.cs
@@ -21,8 +21,7 @@ public BOWImgDescriptorExtractor(Feature2D dextractor, DescriptorMatcher dmatche
                 throw new ArgumentNullException(nameof(dextractor));
             if (dmatcher == null)
                 throw new ArgumentNullException(nameof(dmatcher));
-            ptr = NativeMethods.features2d_BOWImgDescriptorExtractor_new1(dextractor.ptrObj.CvPtr,
-                dmatcher.detectorPtr.CvPtr);
+            ptr = NativeMethods.features2d_BOWImgDescriptorExtractor_new1(dextractor.PtrObj, dmatcher.PtrObj);
         }
 
         /// <summary>
@@ -33,7 +32,7 @@ public BOWImgDescriptorExtractor(DescriptorMatcher dmatcher)
         {
             if (dmatcher == null)
                 throw new ArgumentNullException(nameof(dmatcher));
-            ptr = NativeMethods.features2d_BOWImgDescriptorExtractor_new2(dmatcher.detectorPtr.CvPtr);
+            ptr = NativeMethods.features2d_BOWImgDescriptorExtractor_new2(dmatcher.PtrObj);
         }
 
 #if LANG_JP

diff --git a/src/OpenCvSharp/modules/features2d/BRISK.cs b/src/OpenCvSharp/modules/features2d/BRISK.cs
@@ -20,6 +20,8 @@ public class BRISK : Feature2D
         private bool disposed;
         private Ptr<BRISK> ptrObj;
 
+        internal override IntPtr PtrObj => ptrObj.CvPtr;
+
         #region Init & Disposal
 
         /// <summary>

diff --git a/src/OpenCvSharp/modules/features2d/DescriptorMatcher.cs b/src/OpenCvSharp/modules/features2d/DescriptorMatcher.cs
@@ -15,7 +15,9 @@ public class DescriptorMatcher : Algorithm
         /// <summary>
         /// 
         /// </summary>
-        internal Ptr<DescriptorMatcher> detectorPtr;
+        private Ptr<DescriptorMatcher> detectorPtr;
+
+        internal virtual IntPtr PtrObj => detectorPtr.CvPtr;
 
         #region Init & Disposal
 

diff --git a/src/OpenCvSharp/modules/features2d/FastFeatureDetector.cs b/src/OpenCvSharp/modules/features2d/FastFeatureDetector.cs
@@ -17,6 +17,8 @@ public class FastFeatureDetector : Feature2D
         private bool disposed;
         private Ptr<FastFeatureDetector> ptrObj;
 
+        internal override IntPtr PtrObj => ptrObj.CvPtr;
+
         #region Init & Disposal
 
         /// <summary>

diff --git a/src/OpenCvSharp/modules/features2d/Feature2D.cs b/src/OpenCvSharp/modules/features2d/Feature2D.cs
@@ -14,7 +14,9 @@ public class Feature2D : Algorithm
         /// <summary>
         /// cv::Ptr&lt;Feature2D&gt;
         /// </summary>
-        internal Ptr<Feature2D> ptrObj;
+        private Ptr<Feature2D> ptrObj;
+
+        internal virtual IntPtr PtrObj => ptrObj.CvPtr;
 
         /// <summary>
         /// 

diff --git a/src/OpenCvSharp/modules/features2d/FlannBasedMatcher.cs b/src/OpenCvSharp/modules/features2d/FlannBasedMatcher.cs
@@ -16,6 +16,8 @@ public class FlannBasedMatcher : DescriptorMatcher
         private bool disposed;
         private Ptr<FlannBasedMatcher> detectorPtr;
 
+        internal override IntPtr PtrObj => detectorPtr.CvPtr;
+
         #region Init & Disposal
 
         /// <summary>

diff --git a/src/OpenCvSharp/modules/features2d/GFTTDetector.cs b/src/OpenCvSharp/modules/features2d/GFTTDetector.cs
@@ -14,6 +14,8 @@ public class GFTTDetector : Feature2D
         private bool disposed;
         private Ptr<GFTTDetector> ptrObj;
 
+        internal override IntPtr PtrObj => ptrObj.CvPtr;
+
         #region Init & Disposal
 
         /// <summary>

diff --git a/src/OpenCvSharp/modules/features2d/KAZE.cs b/src/OpenCvSharp/modules/features2d/KAZE.cs
@@ -18,6 +18,8 @@ public class KAZE : Feature2D
         private bool disposed;
         private Ptr<KAZE> ptrObj;
 
+        internal override IntPtr PtrObj => ptrObj.CvPtr;
+
         #region Init & Disposal
 
         /// <summary>

diff --git a/src/OpenCvSharp/modules/features2d/MSER.cs b/src/OpenCvSharp/modules/features2d/MSER.cs
@@ -21,6 +21,8 @@ public class MSER : Feature2D
         private bool disposed;
         private Ptr<MSER> ptrObj;
 
+        internal override IntPtr PtrObj => ptrObj.CvPtr;
+
         #region Init & Disposal
 
         /// <summary>

diff --git a/src/OpenCvSharp/modules/features2d/ORB.cs b/src/OpenCvSharp/modules/features2d/ORB.cs
@@ -24,6 +24,8 @@ public class ORB : Feature2D
         private bool disposed;
         private Ptr<ORB> ptrObj;
 
+        internal override IntPtr PtrObj => ptrObj.CvPtr;
+
         #region Init & Disposal
 
         /// <summary>

diff --git a/src/OpenCvSharp/modules/features2d/SimpleBlobDetector.cs b/src/OpenCvSharp/modules/features2d/SimpleBlobDetector.cs
@@ -11,6 +11,8 @@ public class SimpleBlobDetector : Feature2D
         private bool disposed;
         private Ptr<SimpleBlobDetector> ptrObj;
 
+        internal override IntPtr PtrObj => ptrObj.CvPtr;
+
         /// <summary>
         /// SimpleBlobDetector parameters
         /// </summary>

diff --git a/src/OpenCvSharp/modules/xfeatures2d/BriefDescriptorExtractor.cs b/src/OpenCvSharp/modules/xfeatures2d/BriefDescriptorExtractor.cs
@@ -23,6 +23,8 @@ public class BriefDescriptorExtractor : DescriptorExtractor
         /// </summary>
         private Ptr<BriefDescriptorExtractor> ptrObj;
 
+        internal override IntPtr PtrObj => ptrObj.CvPtr;
+
         /// <summary>
         /// 
         /// </summary>

diff --git a/src/OpenCvSharp/modules/xfeatures2d/FREAK.cs b/src/OpenCvSharp/modules/xfeatures2d/FREAK.cs
@@ -20,6 +20,8 @@ public class FREAK : Feature2D
         private bool disposed;
         private Ptr<FREAK> ptrObj;
 
+        internal override IntPtr PtrObj => ptrObj.CvPtr;
+
         #region Init & Disposal
 
         /// <summary>

diff --git a/src/OpenCvSharp/modules/xfeatures2d/StarDetector.cs b/src/OpenCvSharp/modules/xfeatures2d/StarDetector.cs
@@ -17,6 +17,8 @@ public class StarDetector : Feature2D
         private bool disposed;
         private Ptr<StarDetector> ptrObj;
 
+        internal override IntPtr PtrObj => ptrObj.CvPtr;
+
         #region Init & Disposal
 
         /// <summary>