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
e43a5ff9
Commit
e43a5ff9
authored
Nov 30, 2018
by
Sergiu Deitsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed gcc 5.4.0 compilation errors
parent
a1fe8f75
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
7 deletions
+5
-7
intrin_sse.hpp
modules/core/include/opencv2/core/hal/intrin_sse.hpp
+2
-4
sse_utils.hpp
modules/core/include/opencv2/core/sse_utils.hpp
+3
-3
No files found.
modules/core/include/opencv2/core/hal/intrin_sse.hpp
View file @
e43a5ff9
...
...
@@ -1925,13 +1925,11 @@ inline void v_load_deinterleave(const unsigned* ptr, v_uint32x4& a, v_uint32x4&
inline
void
v_load_deinterleave
(
const
float
*
ptr
,
v_float32x4
&
a
,
v_float32x4
&
b
)
{
const
int
mask_lo
=
_MM_SHUFFLE
(
2
,
0
,
2
,
0
),
mask_hi
=
_MM_SHUFFLE
(
3
,
1
,
3
,
1
);
__m128
u0
=
_mm_loadu_ps
(
ptr
);
// a0 b0 a1 b1
__m128
u1
=
_mm_loadu_ps
((
ptr
+
4
));
// a2 b2 a3 b3
a
.
val
=
_mm_shuffle_ps
(
u0
,
u1
,
mask_lo
);
// a0 a1 a2 a3
b
.
val
=
_mm_shuffle_ps
(
u0
,
u1
,
mask_hi
);
// b0 b1 ab b3
a
.
val
=
_mm_shuffle_ps
(
u0
,
u1
,
_MM_SHUFFLE
(
2
,
0
,
2
,
0
)
);
// a0 a1 a2 a3
b
.
val
=
_mm_shuffle_ps
(
u0
,
u1
,
_MM_SHUFFLE
(
3
,
1
,
3
,
1
)
);
// b0 b1 ab b3
}
inline
void
v_load_deinterleave
(
const
float
*
ptr
,
v_float32x4
&
a
,
v_float32x4
&
b
,
v_float32x4
&
c
)
...
...
modules/core/include/opencv2/core/sse_utils.hpp
View file @
e43a5ff9
...
...
@@ -567,7 +567,7 @@ inline void _mm_deinterleave_ps(__m128 & v_r0, __m128 & v_r1, __m128 & v_g0, __m
inline
void
_mm_interleave_ps
(
__m128
&
v_r0
,
__m128
&
v_r1
,
__m128
&
v_g0
,
__m128
&
v_g1
)
{
const
int
mask_lo
=
_MM_SHUFFLE
(
2
,
0
,
2
,
0
),
mask_hi
=
_MM_SHUFFLE
(
3
,
1
,
3
,
1
)
;
enum
{
mask_lo
=
_MM_SHUFFLE
(
2
,
0
,
2
,
0
),
mask_hi
=
_MM_SHUFFLE
(
3
,
1
,
3
,
1
)
}
;
__m128
layer2_chunk0
=
_mm_shuffle_ps
(
v_r0
,
v_r1
,
mask_lo
);
__m128
layer2_chunk2
=
_mm_shuffle_ps
(
v_r0
,
v_r1
,
mask_hi
);
...
...
@@ -588,7 +588,7 @@ inline void _mm_interleave_ps(__m128 & v_r0, __m128 & v_r1, __m128 & v_g0, __m12
inline
void
_mm_interleave_ps
(
__m128
&
v_r0
,
__m128
&
v_r1
,
__m128
&
v_g0
,
__m128
&
v_g1
,
__m128
&
v_b0
,
__m128
&
v_b1
)
{
const
int
mask_lo
=
_MM_SHUFFLE
(
2
,
0
,
2
,
0
),
mask_hi
=
_MM_SHUFFLE
(
3
,
1
,
3
,
1
)
;
enum
{
mask_lo
=
_MM_SHUFFLE
(
2
,
0
,
2
,
0
),
mask_hi
=
_MM_SHUFFLE
(
3
,
1
,
3
,
1
)
}
;
__m128
layer2_chunk0
=
_mm_shuffle_ps
(
v_r0
,
v_r1
,
mask_lo
);
__m128
layer2_chunk3
=
_mm_shuffle_ps
(
v_r0
,
v_r1
,
mask_hi
);
...
...
@@ -615,7 +615,7 @@ inline void _mm_interleave_ps(__m128 & v_r0, __m128 & v_r1, __m128 & v_g0,
inline
void
_mm_interleave_ps
(
__m128
&
v_r0
,
__m128
&
v_r1
,
__m128
&
v_g0
,
__m128
&
v_g1
,
__m128
&
v_b0
,
__m128
&
v_b1
,
__m128
&
v_a0
,
__m128
&
v_a1
)
{
const
int
mask_lo
=
_MM_SHUFFLE
(
2
,
0
,
2
,
0
),
mask_hi
=
_MM_SHUFFLE
(
3
,
1
,
3
,
1
)
;
enum
{
mask_lo
=
_MM_SHUFFLE
(
2
,
0
,
2
,
0
),
mask_hi
=
_MM_SHUFFLE
(
3
,
1
,
3
,
1
)
}
;
__m128
layer2_chunk0
=
_mm_shuffle_ps
(
v_r0
,
v_r1
,
mask_lo
);
__m128
layer2_chunk4
=
_mm_shuffle_ps
(
v_r0
,
v_r1
,
mask_hi
);
...
...
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