Boring changes - gpuimgproc.

diff --git a/modules/gpuimgproc/src/canny.cpp b/modules/gpuimgproc/src/canny.cpp
index d6f5e6b..17f0395 100644 (file)
--- a/modules/gpuimgproc/src/canny.cpp
+++ b/modules/gpuimgproc/src/canny.cpp
@@ -228,7 +228,7 @@ namespace
 
 Ptr<CannyEdgeDetector> cv::gpu::createCannyEdgeDetector(double low_thresh, double high_thresh, int apperture_size, bool L2gradient)
 {
-    return new CannyImpl(low_thresh, high_thresh, apperture_size, L2gradient);
+    return makePtr<CannyImpl>(low_thresh, high_thresh, apperture_size, L2gradient);
 }
 
 #endif /* !defined (HAVE_CUDA) */

diff --git a/modules/gpuimgproc/src/corners.cpp b/modules/gpuimgproc/src/corners.cpp
index 5df5063..6b53e6f 100644 (file)
--- a/modules/gpuimgproc/src/corners.cpp
+++ b/modules/gpuimgproc/src/corners.cpp
@@ -178,12 +178,12 @@ namespace
 
 Ptr<gpu::CornernessCriteria> cv::gpu::createHarrisCorner(int srcType, int blockSize, int ksize, double k, int borderType)
 {
-    return new Harris(srcType, blockSize, ksize, k, borderType);
+    return makePtr<Harris>(srcType, blockSize, ksize, k, borderType);
 }
 
 Ptr<gpu::CornernessCriteria> cv::gpu::createMinEigenValCorner(int srcType, int blockSize, int ksize, int borderType)
 {
-    return new MinEigenVal(srcType, blockSize, ksize, borderType);
+    return makePtr<MinEigenVal>(srcType, blockSize, ksize, borderType);
 }
 
 #endif /* !defined (HAVE_CUDA) */

diff --git a/modules/gpuimgproc/src/generalized_hough.cpp b/modules/gpuimgproc/src/generalized_hough.cpp
index 6adfcb7..abcd3ef 100644 (file)
--- a/modules/gpuimgproc/src/generalized_hough.cpp
+++ b/modules/gpuimgproc/src/generalized_hough.cpp
@@ -554,7 +554,7 @@ namespace
 
 Ptr<GeneralizedHoughBallard> cv::gpu::createGeneralizedHoughBallard()
 {
-    return new GeneralizedHoughBallardImpl;
+    return makePtr<GeneralizedHoughBallardImpl>();
 }
 
 // GeneralizedHoughGuil
@@ -900,7 +900,7 @@ namespace
 
 Ptr<GeneralizedHoughGuil> cv::gpu::createGeneralizedHoughGuil()
 {
-    return new GeneralizedHoughGuilImpl;
+    return makePtr<GeneralizedHoughGuilImpl>();
 }
 
 #endif /* !defined (HAVE_CUDA) */

diff --git a/modules/gpuimgproc/src/gftt.cpp b/modules/gpuimgproc/src/gftt.cpp
index ff197d8..0446b6c 100644 (file)
--- a/modules/gpuimgproc/src/gftt.cpp
+++ b/modules/gpuimgproc/src/gftt.cpp
@@ -209,7 +209,8 @@ namespace
 Ptr<gpu::CornersDetector> cv::gpu::createGoodFeaturesToTrackDetector(int srcType, int maxCorners, double qualityLevel, double minDistance,
                                                                      int blockSize, bool useHarrisDetector, double harrisK)
 {
-    return new GoodFeaturesToTrackDetector(srcType, maxCorners, qualityLevel, minDistance, blockSize, useHarrisDetector, harrisK);
+    return Ptr<gpu::CornersDetector>(
+        new GoodFeaturesToTrackDetector(srcType, maxCorners, qualityLevel, minDistance, blockSize, useHarrisDetector, harrisK));
 }
 
 #endif /* !defined (HAVE_CUDA) */

diff --git a/modules/gpuimgproc/src/histogram.cpp b/modules/gpuimgproc/src/histogram.cpp
index 1baa892..eb78ee0 100644 (file)
--- a/modules/gpuimgproc/src/histogram.cpp
+++ b/modules/gpuimgproc/src/histogram.cpp
@@ -257,7 +257,7 @@ namespace
 
 cv::Ptr<cv::gpu::CLAHE> cv::gpu::createCLAHE(double clipLimit, cv::Size tileGridSize)
 {
-    return new CLAHE_Impl(clipLimit, tileGridSize.width, tileGridSize.height);
+    return makePtr<CLAHE_Impl>(clipLimit, tileGridSize.width, tileGridSize.height);
 }
 
 ////////////////////////////////////////////////////////////////////////

diff --git a/modules/gpuimgproc/src/hough_circles.cpp b/modules/gpuimgproc/src/hough_circles.cpp
index fa583c0..f123cf5 100644 (file)
--- a/modules/gpuimgproc/src/hough_circles.cpp
+++ b/modules/gpuimgproc/src/hough_circles.cpp
@@ -291,7 +291,7 @@ namespace
 
 Ptr<HoughCirclesDetector> cv::gpu::createHoughCirclesDetector(float dp, float minDist, int cannyThreshold, int votesThreshold, int minRadius, int maxRadius, int maxCircles)
 {
-    return new HoughCirclesDetectorImpl(dp, minDist, cannyThreshold, votesThreshold, minRadius, maxRadius, maxCircles);
+    return makePtr<HoughCirclesDetectorImpl>(dp, minDist, cannyThreshold, votesThreshold, minRadius, maxRadius, maxCircles);
 }
 
 #endif /* !defined (HAVE_CUDA) */

diff --git a/modules/gpuimgproc/src/hough_lines.cpp b/modules/gpuimgproc/src/hough_lines.cpp
index e0dec30..e3e03cb 100644 (file)
--- a/modules/gpuimgproc/src/hough_lines.cpp
+++ b/modules/gpuimgproc/src/hough_lines.cpp
@@ -196,7 +196,7 @@ namespace
 
 Ptr<HoughLinesDetector> cv::gpu::createHoughLinesDetector(float rho, float theta, int threshold, bool doSort, int maxLines)
 {
-    return new HoughLinesDetectorImpl(rho, theta, threshold, doSort, maxLines);
+    return makePtr<HoughLinesDetectorImpl>(rho, theta, threshold, doSort, maxLines);
 }
 
 #endif /* !defined (HAVE_CUDA) */

diff --git a/modules/gpuimgproc/src/hough_segments.cpp b/modules/gpuimgproc/src/hough_segments.cpp
index 1f11be6..6f888a2 100644 (file)
--- a/modules/gpuimgproc/src/hough_segments.cpp
+++ b/modules/gpuimgproc/src/hough_segments.cpp
@@ -177,7 +177,7 @@ namespace
 
 Ptr<HoughSegmentDetector> cv::gpu::createHoughSegmentDetector(float rho, float theta, int minLineLength, int maxLineGap, int maxLines)
 {
-    return new HoughSegmentDetectorImpl(rho, theta, minLineLength, maxLineGap, maxLines);
+    return makePtr<HoughSegmentDetectorImpl>(rho, theta, minLineLength, maxLineGap, maxLines);
 }
 
 #endif /* !defined (HAVE_CUDA) */

diff --git a/modules/gpuimgproc/src/match_template.cpp b/modules/gpuimgproc/src/match_template.cpp
index 2b5d5cb..aeebd01 100644 (file)
--- a/modules/gpuimgproc/src/match_template.cpp
+++ b/modules/gpuimgproc/src/match_template.cpp
@@ -607,10 +607,10 @@ Ptr<gpu::TemplateMatching> cv::gpu::createTemplateMatching(int srcType, int meth
         switch (method)
         {
         case TM_SQDIFF:
-            return new Match_SQDIFF_32F;
+            return makePtr<Match_SQDIFF_32F>();
 
         case TM_CCORR:
-            return new Match_CCORR_32F(user_block_size);
+            return makePtr<Match_CCORR_32F>(user_block_size);
 
         default:
             CV_Error( Error::StsBadFlag, "Unsopported method" );
@@ -622,22 +622,22 @@ Ptr<gpu::TemplateMatching> cv::gpu::createTemplateMatching(int srcType, int meth
         switch (method)
         {
         case TM_SQDIFF:
-            return new Match_SQDIFF_8U(user_block_size);
+            return makePtr<Match_SQDIFF_8U>(user_block_size);
 
         case TM_SQDIFF_NORMED:
-            return new Match_SQDIFF_NORMED_8U(user_block_size);
+            return makePtr<Match_SQDIFF_NORMED_8U>(user_block_size);
 
         case TM_CCORR:
-            return new Match_CCORR_8U(user_block_size);
+            return makePtr<Match_CCORR_8U>(user_block_size);
 
         case TM_CCORR_NORMED:
-            return new Match_CCORR_NORMED_8U(user_block_size);
+            return makePtr<Match_CCORR_NORMED_8U>(user_block_size);
 
         case TM_CCOEFF:
-            return new Match_CCOEFF_8U(user_block_size);
+            return makePtr<Match_CCOEFF_8U>(user_block_size);
 
         case TM_CCOEFF_NORMED:
-            return new Match_CCOEFF_NORMED_8U(user_block_size);
+            return makePtr<Match_CCOEFF_NORMED_8U>(user_block_size);
 
         default:
             CV_Error( Error::StsBadFlag, "Unsopported method" );