Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
605071e7
Commit
605071e7
authored
Nov 19, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #13146 from terfendail:bilateral_nan
parents
94d7c0f7
9ad1a848
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
41 additions
and
0 deletions
+41
-0
intrin_avx.hpp
modules/core/include/opencv2/core/hal/intrin_avx.hpp
+5
-0
intrin_cpp.hpp
modules/core/include/opencv2/core/hal/intrin_cpp.hpp
+19
-0
intrin_neon.hpp
modules/core/include/opencv2/core/hal/intrin_neon.hpp
+7
-0
intrin_sse.hpp
modules/core/include/opencv2/core/hal/intrin_sse.hpp
+5
-0
intrin_vsx.hpp
modules/core/include/opencv2/core/hal/intrin_vsx.hpp
+5
-0
bilateral_filter.cpp
modules/imgproc/src/bilateral_filter.cpp
+0
-0
No files found.
modules/core/include/opencv2/core/hal/intrin_avx.hpp
View file @
605071e7
...
...
@@ -905,6 +905,11 @@ OPENCV_HAL_IMPL_AVX_CMP_OP_64BIT(v_int64x4)
OPENCV_HAL_IMPL_AVX_CMP_OP_FLT
(
v_float32x8
,
ps
)
OPENCV_HAL_IMPL_AVX_CMP_OP_FLT
(
v_float64x4
,
pd
)
inline
v_float32x8
v_not_nan
(
const
v_float32x8
&
a
)
{
return
v_float32x8
(
_mm256_cmp_ps
(
a
.
val
,
a
.
val
,
_CMP_ORD_Q
));
}
inline
v_float64x4
v_not_nan
(
const
v_float64x4
&
a
)
{
return
v_float64x4
(
_mm256_cmp_pd
(
a
.
val
,
a
.
val
,
_CMP_ORD_Q
));
}
/** min/max **/
OPENCV_HAL_IMPL_AVX_BIN_FUNC
(
v_min
,
v_uint8x32
,
_mm256_min_epu8
)
OPENCV_HAL_IMPL_AVX_BIN_FUNC
(
v_max
,
v_uint8x32
,
_mm256_max_epu8
)
...
...
modules/core/include/opencv2/core/hal/intrin_cpp.hpp
View file @
605071e7
...
...
@@ -683,6 +683,25 @@ OPENCV_HAL_IMPL_CMP_OP(==)
For all types except 64-bit integer values. */
OPENCV_HAL_IMPL_CMP_OP
(
!=
)
template
<
int
n
>
inline
v_reg
<
float
,
n
>
v_not_nan
(
const
v_reg
<
float
,
n
>&
a
)
{
typedef
typename
V_TypeTraits
<
float
>::
int_type
itype
;
v_reg
<
float
,
n
>
c
;
for
(
int
i
=
0
;
i
<
n
;
i
++
)
c
.
s
[
i
]
=
V_TypeTraits
<
float
>::
reinterpret_from_int
((
itype
)
-
(
int
)(
a
.
s
[
i
]
==
a
.
s
[
i
]));
return
c
;
}
template
<
int
n
>
inline
v_reg
<
double
,
n
>
v_not_nan
(
const
v_reg
<
double
,
n
>&
a
)
{
typedef
typename
V_TypeTraits
<
double
>::
int_type
itype
;
v_reg
<
double
,
n
>
c
;
for
(
int
i
=
0
;
i
<
n
;
i
++
)
c
.
s
[
i
]
=
V_TypeTraits
<
double
>::
reinterpret_from_int
((
itype
)
-
(
int
)(
a
.
s
[
i
]
==
a
.
s
[
i
]));
return
c
;
}
//! @brief Helper macro
//! @ingroup core_hal_intrin_impl
#define OPENCV_HAL_IMPL_ARITHM_OP(func, bin_op, cast_op, _Tp2) \
...
...
modules/core/include/opencv2/core/hal/intrin_neon.hpp
View file @
605071e7
...
...
@@ -764,6 +764,13 @@ OPENCV_HAL_IMPL_NEON_INT_CMP_OP(v_int64x2, vreinterpretq_s64_u64, s64, u64)
OPENCV_HAL_IMPL_NEON_INT_CMP_OP
(
v_float64x2
,
vreinterpretq_f64_u64
,
f64
,
u64
)
#endif
inline
v_float32x4
v_not_nan
(
const
v_float32x4
&
a
)
{
return
v_float32x4
(
vreinterpretq_f32_u32
(
vceqq_f32
(
a
.
val
,
a
.
val
)));
}
#if CV_SIMD128_64F
inline
v_float64x2
v_not_nan
(
const
v_float64x2
&
a
)
{
return
v_float64x2
(
vreinterpretq_f64_u64
(
vceqq_f64
(
a
.
val
,
a
.
val
)));
}
#endif
OPENCV_HAL_IMPL_NEON_BIN_FUNC
(
v_uint8x16
,
v_add_wrap
,
vaddq_u8
)
OPENCV_HAL_IMPL_NEON_BIN_FUNC
(
v_int8x16
,
v_add_wrap
,
vaddq_s8
)
OPENCV_HAL_IMPL_NEON_BIN_FUNC
(
v_uint16x8
,
v_add_wrap
,
vaddq_u16
)
...
...
modules/core/include/opencv2/core/hal/intrin_sse.hpp
View file @
605071e7
...
...
@@ -1041,6 +1041,11 @@ inline _Tpvec operator != (const _Tpvec& a, const _Tpvec& b) \
OPENCV_HAL_IMPL_SSE_64BIT_CMP_OP
(
v_uint64x2
,
v_reinterpret_as_u64
)
OPENCV_HAL_IMPL_SSE_64BIT_CMP_OP
(
v_int64x2
,
v_reinterpret_as_s64
)
inline
v_float32x4
v_not_nan
(
const
v_float32x4
&
a
)
{
return
v_float32x4
(
_mm_cmpord_ps
(
a
.
val
,
a
.
val
));
}
inline
v_float64x2
v_not_nan
(
const
v_float64x2
&
a
)
{
return
v_float64x2
(
_mm_cmpord_pd
(
a
.
val
,
a
.
val
));
}
OPENCV_HAL_IMPL_SSE_BIN_FUNC
(
v_uint8x16
,
v_add_wrap
,
_mm_add_epi8
)
OPENCV_HAL_IMPL_SSE_BIN_FUNC
(
v_int8x16
,
v_add_wrap
,
_mm_add_epi8
)
OPENCV_HAL_IMPL_SSE_BIN_FUNC
(
v_uint16x8
,
v_add_wrap
,
_mm_add_epi16
)
...
...
modules/core/include/opencv2/core/hal/intrin_vsx.hpp
View file @
605071e7
...
...
@@ -607,6 +607,11 @@ OPENCV_HAL_IMPL_VSX_INT_CMP_OP(v_float64x2)
OPENCV_HAL_IMPL_VSX_INT_CMP_OP
(
v_uint64x2
)
OPENCV_HAL_IMPL_VSX_INT_CMP_OP
(
v_int64x2
)
inline
v_float32x4
v_not_nan
(
const
v_float32x4
&
a
)
{
return
v_float32x4
(
vec_cmpeq
(
a
.
val
,
a
.
val
));
}
inline
v_float64x2
v_not_nan
(
const
v_float64x2
&
a
)
{
return
v_float64x2
(
vec_cmpeq
(
a
.
val
,
a
.
val
));
}
/** min/max **/
OPENCV_HAL_IMPL_VSX_BIN_FUNC
(
v_min
,
vec_min
)
OPENCV_HAL_IMPL_VSX_BIN_FUNC
(
v_max
,
vec_max
)
...
...
modules/imgproc/src/bilateral_filter.cpp
View file @
605071e7
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment