From 8eb2c8998c23700f8ef143eb407723d483b2adcb Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Thu, 9 Jul 2026 16:51:20 +0300 Subject: [PATCH] Drop HAL for cv_hal_cvtColorYUV2Gray as it's just copy. --- hal/ipp/include/ipp_hal_imgproc.hpp | 4 ---- hal/ipp/src/color_ipp.cpp | 14 -------------- modules/imgproc/src/color_yuv.dispatch.cpp | 1 - modules/imgproc/src/hal_replacement.hpp | 11 ----------- 4 files changed, 30 deletions(-) diff --git a/hal/ipp/include/ipp_hal_imgproc.hpp b/hal/ipp/include/ipp_hal_imgproc.hpp index 3e5fc137a0..70c643b830 100644 --- a/hal/ipp/include/ipp_hal_imgproc.hpp +++ b/hal/ipp/include/ipp_hal_imgproc.hpp @@ -138,10 +138,6 @@ int ipp_hal_cvtRGBAtoMultipliedRGBA(const uchar * src_data, size_t src_step, uch #undef cv_hal_cvtRGBAtoMultipliedRGBA #define cv_hal_cvtRGBAtoMultipliedRGBA ipp_hal_cvtRGBAtoMultipliedRGBA -int ipp_hal_cvtColorYUV2Gray(const uchar * src_data, size_t src_step, uchar * dst_data, size_t dst_step, int width, int height); -#undef cv_hal_cvtColorYUV2Gray -#define cv_hal_cvtColorYUV2Gray ipp_hal_cvtColorYUV2Gray - #endif // IPP_VERSION_X100 >= 700 #endif //__IPP_HAL_IMGPROC_HPP__ diff --git a/hal/ipp/src/color_ipp.cpp b/hal/ipp/src/color_ipp.cpp index 7214bfc645..ad791b613e 100644 --- a/hal/ipp/src/color_ipp.cpp +++ b/hal/ipp/src/color_ipp.cpp @@ -955,18 +955,4 @@ int ipp_hal_cvtLabtoBGR(const uchar * src_data, size_t src_step, uchar * dst_dat return CV_HAL_ERROR_NOT_IMPLEMENTED; } -int ipp_hal_cvtColorYUV2Gray(const uchar * src_data, size_t src_step, uchar * dst_data, size_t dst_step, - int width, int height) -{ - CV_HAL_CHECK_USE_IPP(); - -#if IPP_VERSION_X100 >= 201700 - if (CV_INSTRUMENT_FUN_IPP(ippiCopy_8u_C1R_L, src_data, (IppSizeL)src_step, dst_data, (IppSizeL)dst_step, - ippiSizeL(width, height)) >= 0) - return CV_HAL_ERROR_OK; -#endif - - return CV_HAL_ERROR_NOT_IMPLEMENTED; -} - #endif // IPP_VERSION_X100 >= 700 diff --git a/modules/imgproc/src/color_yuv.dispatch.cpp b/modules/imgproc/src/color_yuv.dispatch.cpp index f1f91f51db..361eca16e0 100644 --- a/modules/imgproc/src/color_yuv.dispatch.cpp +++ b/modules/imgproc/src/color_yuv.dispatch.cpp @@ -417,7 +417,6 @@ void cvtColorYUV2Gray_420( InputArray _src, OutputArray _dst ) { CvtHelper< Set<1>, Set<1>, Set, FROM_YUV > h(_src, _dst, 1); - CALL_HAL(cvtColorYUV2Gray, cv_hal_cvtColorYUV2Gray, h.src.data, h.src.step, h.dst.data, h.dst.step, h.dstSz.width, h.dstSz.height); h.src(Range(0, h.dstSz.height), Range::all()).copyTo(h.dst); } diff --git a/modules/imgproc/src/hal_replacement.hpp b/modules/imgproc/src/hal_replacement.hpp index 0e2bc4f305..4d3fe4477d 100644 --- a/modules/imgproc/src/hal_replacement.hpp +++ b/modules/imgproc/src/hal_replacement.hpp @@ -1067,16 +1067,6 @@ inline int hal_ni_cvtRGBAtoMultipliedRGBA(const uchar * src_data, size_t src_ste */ inline int hal_ni_cvtMultipliedRGBAtoRGBA(const uchar * src_data, size_t src_step, uchar * dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -/** @brief Extract Y-plane from YUV 4:2:0 image. - @param src_data Source image data pointer (points to Y plane). - @param src_step Source step. - @param dst_data Destination data pointer. - @param dst_step Destination step. - @param width Image width. - @param height Image height (of the Y plane, not the full YUV image). - */ -inline int hal_ni_cvtColorYUV2Gray(const uchar * src_data, size_t src_step, uchar * dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } - //! @cond IGNORED #define cv_hal_cvtBGRtoBGR hal_ni_cvtBGRtoBGR #define cv_hal_cvtBGRtoBGR5x5 hal_ni_cvtBGRtoBGR5x5 @@ -1110,7 +1100,6 @@ inline int hal_ni_cvtColorYUV2Gray(const uchar * src_data, size_t src_step, ucha #define cv_hal_cvtOnePlaneBGRtoYUVApprox hal_ni_cvtOnePlaneBGRtoYUVApprox #define cv_hal_cvtRGBAtoMultipliedRGBA hal_ni_cvtRGBAtoMultipliedRGBA #define cv_hal_cvtMultipliedRGBAtoRGBA hal_ni_cvtMultipliedRGBAtoRGBA -#define cv_hal_cvtColorYUV2Gray hal_ni_cvtColorYUV2Gray //! @endcond /**