third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22937 from asmorkalov:as/issue_22893

Browse Source
This commit is contained in:
Alexander Alekhin 2022-12-09 17:11:51 +00:00
commit ebaee3ea21
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdparty/carotene/hal/tegra_hal.hpp vendored
View File

@ -1296,13 +1296,13 @@ struct MorphCtx
CAROTENE_NS::BORDER_MODE border; CAROTENE_NS::BORDER_MODE border;
uchar borderValues[4]; uchar borderValues[4];
}; };
inline int TEGRA_MORPHINIT(cvhalFilter2D **context, int operation, int src_type, int dst_type, int, int, inline int TEGRA_MORPHINIT(cvhalFilter2D **context, int operation, int src_type, int dst_type, int width, int height,
int kernel_type, uchar *kernel_data, size_t kernel_step, int kernel_width, int kernel_height, int anchor_x, int anchor_y, int kernel_type, uchar *kernel_data, size_t kernel_step, int kernel_width, int kernel_height, int anchor_x, int anchor_y,
int borderType, const double borderValue[4], int iterations, bool allowSubmatrix, bool allowInplace) int borderType, const double borderValue[4], int iterations, bool allowSubmatrix, bool allowInplace)
{ {
if(!context || !kernel_data || src_type != dst_type || if(!context || !kernel_data || src_type != dst_type ||
CV_MAT_DEPTH(src_type) != CV_8U || src_type < 0 || (src_type >> CV_CN_SHIFT) > 3 || CV_MAT_DEPTH(src_type) != CV_8U || src_type < 0 || (src_type >> CV_CN_SHIFT) > 3 ||
width < kernel_width || height < kernel_height ||
allowSubmatrix || allowInplace || iterations != 1 || allowSubmatrix || allowInplace || iterations != 1 ||
!CAROTENE_NS::isSupportedConfiguration()) !CAROTENE_NS::isSupportedConfiguration())
return CV_HAL_ERROR_NOT_IMPLEMENTED; return CV_HAL_ERROR_NOT_IMPLEMENTED;

13
modules/imgproc/test/test_filter.cpp
View File

@ -2366,5 +2366,18 @@ TEST(Imgproc_GaussianBlur, regression_11303)
EXPECT_LE(cv::norm(src, dst, NORM_L2), 1e-3); EXPECT_LE(cv::norm(src, dst, NORM_L2), 1e-3);
} }
TEST(Imgproc, morphologyEx_small_input_22893)
{
char input_data[] = {1, 2, 3, 4};
char gold_data[] = {2, 3, 4, 4};
cv::Mat img(1, 4, CV_8UC1, input_data);
cv::Mat gold(1, 4, CV_8UC1, gold_data);
cv::Mat kernel = getStructuringElement(cv::MORPH_RECT, cv::Size(4,4));
cv::Mat result;
morphologyEx(img, result, cv::MORPH_DILATE, kernel);
ASSERT_EQ(0, cvtest::norm(result, gold, NORM_INF));
}
}} // namespace }} // namespace