mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 03:30:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12947 from AsyaPronina:sobel_renaming

Browse Source 
* Renamed Sobel operator GAPI kernel to match with OpenCV naming rules

* Fixed perf tests

* Small refactoring to check CI issue

* Refactored alignment for kernel wrappers in imgproc.hpp
This commit is contained in:
AsyaPronina 2018-10-27 19:54:32 +03:00 committed by Alexander Alekhin
parent e0c888acf7
commit e6dd9a78ae
4 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gapi/include/opencv2/gapi/imgproc.hpp
View File

@ -482,7 +482,7 @@ applied (see cv::getDerivKernels for details).
@param borderValue border value in case of constant border type @param borderValue border value in case of constant border type
@sa filter2D, gaussianBlur, cartToPolar @sa filter2D, gaussianBlur, cartToPolar
*/ */
GAPI_EXPORTS GMat sobel(const GMat& src, int ddepth, int dx, int dy, int ksize = 3, GAPI_EXPORTS GMat Sobel(const GMat& src, int ddepth, int dx, int dy, int ksize = 3,
double scale = 1, double delta = 0, double scale = 1, double delta = 0,
int borderType = BORDER_DEFAULT, int borderType = BORDER_DEFAULT,
const Scalar& borderValue = Scalar(0)); const Scalar& borderValue = Scalar(0));

2
modules/gapi/perf/common/gapi_imgproc_perf_tests.hpp
View File

@ -462,7 +462,7 @@ PERF_TEST_P_(SobelPerfTest, TestPerformance)
// G-API code ////////////////////////////////////////////////////////////// // G-API code //////////////////////////////////////////////////////////////
cv::GMat in; cv::GMat in;
auto out = cv::gapi::sobel(in, dtype, dx, dy, kernSize ); auto out = cv::gapi::Sobel(in, dtype, dx, dy, kernSize );
cv::GComputation c(in, out); cv::GComputation c(in, out);
// Warm-up graph engine: // Warm-up graph engine:

2
modules/gapi/src/api/kernels_imgproc.cpp
View File

@ -73,7 +73,7 @@ GMat dilate3x3(const GMat& src, int iterations,
return dilate(src, cv::Mat(), cv::Point(-1,-1), iterations, borderType, borderValue); return dilate(src, cv::Mat(), cv::Point(-1,-1), iterations, borderType, borderValue);
} }
GMat sobel(const GMat& src, int ddepth, int dx, int dy, int ksize, GMat Sobel(const GMat& src, int ddepth, int dx, int dy, int ksize,
double scale, double delta, double scale, double delta,
int borderType, const Scalar& bordVal) int borderType, const Scalar& bordVal)
{ {

2
modules/gapi/test/common/gapi_imgproc_tests_inl.hpp
View File

@ -395,7 +395,7 @@ TEST_P(SobelTest, AccuracyTest)
// G-API code ////////////////////////////////////////////////////////////// // G-API code //////////////////////////////////////////////////////////////
cv::GMat in; cv::GMat in;
auto out = cv::gapi::sobel(in, dtype, dx, dy, kernSize ); auto out = cv::gapi::Sobel(in, dtype, dx, dy, kernSize );
cv::GComputation c(in, out); cv::GComputation c(in, out);
c.apply(in_mat1, out_mat_gapi, std::move(compile_args)); c.apply(in_mat1, out_mat_gapi, std::move(compile_args));