fixed compilation issues
This commit is contained in:
@@ -1445,7 +1445,7 @@ struct RGB2Gray<float>
|
||||
float32x4_t v_cb, v_cg, v_cr;
|
||||
};
|
||||
|
||||
#elif CV_SSE2
|
||||
#elif CV_SSE4_1
|
||||
|
||||
template <>
|
||||
struct RGB2Gray<ushort>
|
||||
@@ -2106,7 +2106,7 @@ struct RGB2YCrCb_i<ushort>
|
||||
int32x4_t v_c0, v_c1, v_c2, v_c3, v_c4, v_delta, v_delta2;
|
||||
};
|
||||
|
||||
#elif CV_SSE2
|
||||
#elif CV_SSE4_1
|
||||
|
||||
template <>
|
||||
struct RGB2YCrCb_i<uchar>
|
||||
@@ -2247,8 +2247,6 @@ struct RGB2YCrCb_i<uchar>
|
||||
__m128i v_zero;
|
||||
};
|
||||
|
||||
#if CV_SSE4_1
|
||||
|
||||
template <>
|
||||
struct RGB2YCrCb_i<ushort>
|
||||
{
|
||||
@@ -2369,9 +2367,6 @@ struct RGB2YCrCb_i<ushort>
|
||||
|
||||
#endif // CV_SSE4_1
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
template<typename _Tp> struct YCrCb2RGB_f
|
||||
{
|
||||
typedef _Tp channel_type;
|
||||
|
@@ -2306,7 +2306,7 @@ struct ResizeAreaFastVec_SIMD_32f
|
||||
|
||||
if (cn == 1)
|
||||
{
|
||||
int shuffle_lo = _MM_SHUFFLE(2, 0, 2, 0), shuffle_hi = _MM_SHUFFLE(3, 1, 3, 1);
|
||||
const int shuffle_lo = _MM_SHUFFLE(2, 0, 2, 0), shuffle_hi = _MM_SHUFFLE(3, 1, 3, 1);
|
||||
for ( ; dx <= w - 4; dx += 4, S0 += 8, S1 += 8, D += 4)
|
||||
{
|
||||
__m128 v_row00 = _mm_loadu_ps(S0), v_row01 = _mm_loadu_ps(S0 + 4),
|
||||
|
@@ -236,7 +236,11 @@ struct PyrDownVec_32s16u
|
||||
bool haveSSE;
|
||||
};
|
||||
|
||||
#endif
|
||||
#else
|
||||
|
||||
typedef PyrDownNoVec<int, ushort> PyrDownVec_32s16u;
|
||||
|
||||
#endif // CV_SSE4_1
|
||||
|
||||
struct PyrDownVec_32s16s
|
||||
{
|
||||
@@ -288,7 +292,6 @@ struct PyrDownVec_32s16s
|
||||
bool haveSSE;
|
||||
};
|
||||
|
||||
|
||||
struct PyrUpVec_32s8u
|
||||
{
|
||||
int operator()(int** src, uchar** dst, int, int width) const
|
||||
@@ -471,7 +474,11 @@ struct PyrUpVec_32s16u
|
||||
}
|
||||
};
|
||||
|
||||
#endif
|
||||
#else
|
||||
|
||||
typedef PyrUpNoVec<int, ushort> PyrUpVec_32s16u;
|
||||
|
||||
#endif // CV_SSE4_1
|
||||
|
||||
struct PyrUpVec_32f
|
||||
{
|
||||
|
Reference in New Issue
Block a user