External interface converted to use OpenCV Ptr<> smart pointer.

modules/calib3d/src/fundam.cpp

@@ -303,7 +303,7 @@ static bool createAndRunRHORegistrator(double confidence,
      * initialized, used, then finalized.
      */
 
-    RHO_HEST_REFC* p = rhoRefCInit();
+    Ptr<RHO_HEST_REFC> p = rhoRefCInit();
 
     /**
      * Optional. Ideally, the context would survive across calls to
@@ -339,12 +339,6 @@ static bool createAndRunRHORegistrator(double confidence,
                       NULL,
                       (float*)tmpH.data);
 
-    /**
-     * Cleanup.
-     */
-
-    rhoRefCFini(p);
-
     /* Convert float homography to double precision. */
     tmpH.convertTo(_H, CV_64FC1);
 

modules/calib3d/src/rhorefc.cpp

@@ -298,12 +298,13 @@ static inline void   sacSub8x1            (float*       Hout,
  * @return A pointer to the context if successful; NULL if an error occured.
  */
 
-RHO_HEST_REFC* rhoRefCInit(void){
-    RHO_HEST_REFC* p = new RHO_HEST_REFC;
+Ptr<RHO_HEST_REFC> rhoRefCInit(void){
+    Ptr<RHO_HEST_REFC> p = Ptr<RHO_HEST_REFC>(new RHO_HEST_REFC);
 
+    if(p){
         if(!p->initialize()){
-        delete p;
-        p = NULL;
+            p = Ptr<RHO_HEST_REFC>((RHO_HEST_REFC*)NULL);
+        }
     }
 
     return p;
@@ -314,7 +315,7 @@ RHO_HEST_REFC* rhoRefCInit(void){
  * External access to non-randomness table resize.
  */
 
-int  rhoRefCEnsureCapacity(RHO_HEST_REFC* p, unsigned N, double beta){
+int  rhoRefCEnsureCapacity(Ptr<RHO_HEST_REFC> p, unsigned N, double beta){
     return p->sacEnsureCapacity(N, beta);
 }
 
@@ -323,22 +324,11 @@ int  rhoRefCEnsureCapacity(RHO_HEST_REFC* p, unsigned N, double beta){
  * Seeds the internal PRNG with the given seed.
  */
 
-void rhoRefCSeed(RHO_HEST_REFC* p, unsigned long long seed){
+void rhoRefCSeed(Ptr<RHO_HEST_REFC> p, unsigned long long seed){
     p->fastSeed((uint64_t)seed);
 }
 
 
-/**
- * External access to context destructor.
- *
- * @param [in] p  The initialized estimator context to finalize.
- */
-
-void rhoRefCFini(RHO_HEST_REFC* p){
-    delete p;
-}
-
-
 /**
  * Estimates the homography using the given context, matches and parameters to
  * PROSAC.
@@ -368,7 +358,7 @@ void rhoRefCFini(RHO_HEST_REFC* p){
  *                         inliers for acceptance was reached; 0 otherwise.
  */
 
-unsigned rhoRefC(RHO_HEST_REFC* p,       /* Homography estimation context. */
+unsigned rhoRefC(Ptr<RHO_HEST_REFC> p,       /* Homography estimation context. */
                  const float*       src,     /* Source points */
                  const float*       dst,     /* Destination points */
                  char*              inl,     /* Inlier mask */

modules/calib3d/src/rhorefc.h

@@ -50,6 +50,7 @@
 
 
 /* Includes */
+#include <opencv2/core.hpp>
 
 
 
@@ -96,7 +97,7 @@ typedef struct RHO_HEST_REFC RHO_HEST_REFC;
  * @return A pointer to the context if successful; NULL if an error occured.
  */
 
-RHO_HEST_REFC* rhoRefCInit(void);
+Ptr<RHO_HEST_REFC> rhoRefCInit(void);
 
 
 /**
@@ -114,7 +115,7 @@ RHO_HEST_REFC* rhoRefCInit(void);
  * @return 0 if successful; non-zero if an error occured.
  */
 
-int  rhoRefCEnsureCapacity(RHO_HEST_REFC* p, unsigned N, double beta);
+int  rhoRefCEnsureCapacity(Ptr<RHO_HEST_REFC> p, unsigned N, double beta);
 
 
 
@@ -129,18 +130,7 @@ int  rhoRefCEnsureCapacity(RHO_HEST_REFC* p, unsigned N, double beta);
  * @param [in] seed The 64-bit integer seed.
  */
 
-void rhoRefCSeed(RHO_HEST_REFC* p, unsigned long long seed);
-
-
-
-/**
- * Finalize the estimator context, by freeing the aligned buffers used
- * internally.
- *
- * @param [in] p  The initialized estimator context to finalize.
- */
-
-void rhoRefCFini(RHO_HEST_REFC* p);
+void rhoRefCSeed(Ptr<RHO_HEST_REFC> p, unsigned long long seed);
 
 
 /**
@@ -250,7 +240,7 @@ void rhoRefCFini(RHO_HEST_REFC* p);
  *                         inliers for acceptance was reached; 0 otherwise.
  */
 
-unsigned rhoRefC(RHO_HEST_REFC* p,       /* Homography estimation context. */
+unsigned rhoRefC(Ptr<RHO_HEST_REFC> p,       /* Homography estimation context. */
                  const float*       src,     /* Source points */
                  const float*       dst,     /* Destination points */
                  char*              inl,     /* Inlier mask */