From 1a9e96df22ad63fa6a3997f1cb16b90ea5a073d2 Mon Sep 17 00:00:00 2001 From: Denes Tarjan Date: Tue, 17 Sep 2024 13:57:38 +0000 Subject: [PATCH] Fix OpenCV compilation when the KleidiCV patch is not applied --- adapters/opencv/kleidicv_hal.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/adapters/opencv/kleidicv_hal.h b/adapters/opencv/kleidicv_hal.h index 5b2e5ca86..f3de8c16b 100644 --- a/adapters/opencv/kleidicv_hal.h +++ b/adapters/opencv/kleidicv_hal.h @@ -506,6 +506,9 @@ KLEIDICV_HAL_MUL(mul16s, kleidicv_saturating_multiply_s16, int16_t); #define cv_hal_mul16s kleidicv_mul16s_with_fallback // inRange +// This condition can be removed if this HAL macro is defined in all supported +// versions +#ifdef cv_hal_inRange8u static inline int kleidicv_in_range_u8_with_fallback( const uchar *src_data, size_t src_step, uchar *dst_data, size_t dst_step, int dst_depth, size_t width, size_t height, int cn, uchar lower_bound, @@ -516,7 +519,11 @@ static inline int kleidicv_in_range_u8_with_fallback( } #undef cv_hal_inRange8u #define cv_hal_inRange8u kleidicv_in_range_u8_with_fallback +#endif // cv_hal_inRange8u +// This condition can be removed if this HAL macro is defined in all supported +// versions +#ifdef cv_hal_inRange32f static inline int kleidicv_in_range_f32_with_fallback( const uchar *src_data, size_t src_step, uchar *dst_data, size_t dst_step, int dst_depth, size_t width, size_t height, int cn, double lower_bound, @@ -527,6 +534,7 @@ static inline int kleidicv_in_range_f32_with_fallback( } #undef cv_hal_inRange32f #define cv_hal_inRange32f kleidicv_in_range_f32_with_fallback +#endif // cv_hal_inRange32f #endif // OPENCV_CORE_HAL_REPLACEMENT_HPP -- GitLab