mirror of
https://github.com/opencv/opencv.git
synced 2026-07-21 19:33:03 +04:00
Drop HAL for cv_hal_cvtColorYUV2Gray as it's just copy.
This commit is contained in:
@@ -138,10 +138,6 @@ int ipp_hal_cvtRGBAtoMultipliedRGBA(const uchar * src_data, size_t src_step, uch
|
|||||||
#undef cv_hal_cvtRGBAtoMultipliedRGBA
|
#undef cv_hal_cvtRGBAtoMultipliedRGBA
|
||||||
#define cv_hal_cvtRGBAtoMultipliedRGBA ipp_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_VERSION_X100 >= 700
|
||||||
|
|
||||||
#endif //__IPP_HAL_IMGPROC_HPP__
|
#endif //__IPP_HAL_IMGPROC_HPP__
|
||||||
|
|||||||
@@ -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;
|
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
|
#endif // IPP_VERSION_X100 >= 700
|
||||||
|
|||||||
@@ -417,7 +417,6 @@ void cvtColorYUV2Gray_420( InputArray _src, OutputArray _dst )
|
|||||||
{
|
{
|
||||||
CvtHelper< Set<1>, Set<1>, Set<CV_8U>, FROM_YUV > h(_src, _dst, 1);
|
CvtHelper< Set<1>, Set<1>, Set<CV_8U>, 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);
|
h.src(Range(0, h.dstSz.height), Range::all()).copyTo(h.dst);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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; }
|
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
|
//! @cond IGNORED
|
||||||
#define cv_hal_cvtBGRtoBGR hal_ni_cvtBGRtoBGR
|
#define cv_hal_cvtBGRtoBGR hal_ni_cvtBGRtoBGR
|
||||||
#define cv_hal_cvtBGRtoBGR5x5 hal_ni_cvtBGRtoBGR5x5
|
#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_cvtOnePlaneBGRtoYUVApprox hal_ni_cvtOnePlaneBGRtoYUVApprox
|
||||||
#define cv_hal_cvtRGBAtoMultipliedRGBA hal_ni_cvtRGBAtoMultipliedRGBA
|
#define cv_hal_cvtRGBAtoMultipliedRGBA hal_ni_cvtRGBAtoMultipliedRGBA
|
||||||
#define cv_hal_cvtMultipliedRGBAtoRGBA hal_ni_cvtMultipliedRGBAtoRGBA
|
#define cv_hal_cvtMultipliedRGBAtoRGBA hal_ni_cvtMultipliedRGBAtoRGBA
|
||||||
#define cv_hal_cvtColorYUV2Gray hal_ni_cvtColorYUV2Gray
|
|
||||||
//! @endcond
|
//! @endcond
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user