Boring changes - gpuimgproc.

This commit is contained in:
Roman Donchenko 2013-08-13 18:15:02 +04:00
parent b165016ba7
commit a007c7b980
9 changed files with 19 additions and 18 deletions

View File

@ -228,7 +228,7 @@ namespace
Ptr<CannyEdgeDetector> cv::gpu::createCannyEdgeDetector(double low_thresh, double high_thresh, int apperture_size, bool L2gradient) 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) */ #endif /* !defined (HAVE_CUDA) */

View File

@ -178,12 +178,12 @@ namespace
Ptr<gpu::CornernessCriteria> cv::gpu::createHarrisCorner(int srcType, int blockSize, int ksize, double k, int borderType) 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) 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) */ #endif /* !defined (HAVE_CUDA) */

View File

@ -554,7 +554,7 @@ namespace
Ptr<GeneralizedHoughBallard> cv::gpu::createGeneralizedHoughBallard() Ptr<GeneralizedHoughBallard> cv::gpu::createGeneralizedHoughBallard()
{ {
return new GeneralizedHoughBallardImpl; return makePtr<GeneralizedHoughBallardImpl>();
} }
// GeneralizedHoughGuil // GeneralizedHoughGuil
@ -900,7 +900,7 @@ namespace
Ptr<GeneralizedHoughGuil> cv::gpu::createGeneralizedHoughGuil() Ptr<GeneralizedHoughGuil> cv::gpu::createGeneralizedHoughGuil()
{ {
return new GeneralizedHoughGuilImpl; return makePtr<GeneralizedHoughGuilImpl>();
} }
#endif /* !defined (HAVE_CUDA) */ #endif /* !defined (HAVE_CUDA) */

View File

@ -209,7 +209,8 @@ namespace
Ptr<gpu::CornersDetector> cv::gpu::createGoodFeaturesToTrackDetector(int srcType, int maxCorners, double qualityLevel, double minDistance, Ptr<gpu::CornersDetector> cv::gpu::createGoodFeaturesToTrackDetector(int srcType, int maxCorners, double qualityLevel, double minDistance,
int blockSize, bool useHarrisDetector, double harrisK) 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) */ #endif /* !defined (HAVE_CUDA) */

View File

@ -257,7 +257,7 @@ namespace
cv::Ptr<cv::gpu::CLAHE> cv::gpu::createCLAHE(double clipLimit, cv::Size tileGridSize) 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);
} }
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////

View File

@ -291,7 +291,7 @@ namespace
Ptr<HoughCirclesDetector> cv::gpu::createHoughCirclesDetector(float dp, float minDist, int cannyThreshold, int votesThreshold, int minRadius, int maxRadius, int maxCircles) 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) */ #endif /* !defined (HAVE_CUDA) */

View File

@ -196,7 +196,7 @@ namespace
Ptr<HoughLinesDetector> cv::gpu::createHoughLinesDetector(float rho, float theta, int threshold, bool doSort, int maxLines) 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) */ #endif /* !defined (HAVE_CUDA) */

View File

@ -177,7 +177,7 @@ namespace
Ptr<HoughSegmentDetector> cv::gpu::createHoughSegmentDetector(float rho, float theta, int minLineLength, int maxLineGap, int maxLines) 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) */ #endif /* !defined (HAVE_CUDA) */

View File

@ -607,10 +607,10 @@ Ptr<gpu::TemplateMatching> cv::gpu::createTemplateMatching(int srcType, int meth
switch (method) switch (method)
{ {
case TM_SQDIFF: case TM_SQDIFF:
return new Match_SQDIFF_32F; return makePtr<Match_SQDIFF_32F>();
case TM_CCORR: case TM_CCORR:
return new Match_CCORR_32F(user_block_size); return makePtr<Match_CCORR_32F>(user_block_size);
default: default:
CV_Error( Error::StsBadFlag, "Unsopported method" ); CV_Error( Error::StsBadFlag, "Unsopported method" );
@ -622,22 +622,22 @@ Ptr<gpu::TemplateMatching> cv::gpu::createTemplateMatching(int srcType, int meth
switch (method) switch (method)
{ {
case TM_SQDIFF: case TM_SQDIFF:
return new Match_SQDIFF_8U(user_block_size); return makePtr<Match_SQDIFF_8U>(user_block_size);
case TM_SQDIFF_NORMED: 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: case TM_CCORR:
return new Match_CCORR_8U(user_block_size); return makePtr<Match_CCORR_8U>(user_block_size);
case TM_CCORR_NORMED: 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: case TM_CCOEFF:
return new Match_CCOEFF_8U(user_block_size); return makePtr<Match_CCOEFF_8U>(user_block_size);
case TM_CCOEFF_NORMED: case TM_CCOEFF_NORMED:
return new Match_CCOEFF_NORMED_8U(user_block_size); return makePtr<Match_CCOEFF_NORMED_8U>(user_block_size);
default: default:
CV_Error( Error::StsBadFlag, "Unsopported method" ); CV_Error( Error::StsBadFlag, "Unsopported method" );