1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00

Merge branch 4.x

This commit is contained in:
Alexander Smorkalov
2024-04-01 17:09:24 +03:00
289 changed files with 49794 additions and 38081 deletions
+4 -4
View File
@@ -1565,9 +1565,9 @@ struct InRange_SIMD<float>
};
template <>
struct InRange_SIMD<float16_t>
struct InRange_SIMD<hfloat>
{
int operator () (const float16_t * src1, const float16_t * src2, const float16_t * src3,
int operator () (const hfloat * src1, const hfloat * src2, const hfloat * src3,
uchar * dst, int len) const
{
int x = 0;
@@ -1712,8 +1712,8 @@ static void inRange64f(const double* src1, size_t step1, const double* src2, siz
inRange_(src1, step1, src2, step2, src3, step3, dst, step, size);
}
static void inRange16f(const float16_t* src1, size_t step1, const float16_t* src2, size_t step2,
const float16_t* src3, size_t step3, uchar* dst, size_t step, Size size)
static void inRange16f(const hfloat* src1, size_t step1, const hfloat* src2, size_t step2,
const hfloat* src3, size_t step3, uchar* dst, size_t step, Size size)
{
inRange_(src1, step1, src2, step2, src3, step3, dst, step, size);
}