Commit 9fa90c88 authored by Alexander Alekhin's avatar Alexander Alekhin

Merge pull request #8899 from tomoaki0705:fixSuppressWarningsUnreachable

parents f49f056d 94848a3e
...@@ -4582,6 +4582,7 @@ cvtScaleHalf_<float, short>( const float* src, size_t sstep, short* dst, size_t ...@@ -4582,6 +4582,7 @@ cvtScaleHalf_<float, short>( const float* src, size_t sstep, short* dst, size_t
{ {
CV_CPU_CALL_FP16(cvtScaleHalf_SIMD32f16f, (src, sstep, dst, dstep, size)); CV_CPU_CALL_FP16(cvtScaleHalf_SIMD32f16f, (src, sstep, dst, dstep, size));
#if !defined(CV_CPU_COMPILE_FP16)
sstep /= sizeof(src[0]); sstep /= sizeof(src[0]);
dstep /= sizeof(dst[0]); dstep /= sizeof(dst[0]);
...@@ -4592,6 +4593,7 @@ cvtScaleHalf_<float, short>( const float* src, size_t sstep, short* dst, size_t ...@@ -4592,6 +4593,7 @@ cvtScaleHalf_<float, short>( const float* src, size_t sstep, short* dst, size_t
dst[x] = convertFp16SW(src[x]); dst[x] = convertFp16SW(src[x]);
} }
} }
#endif
} }
template<> void template<> void
...@@ -4599,6 +4601,7 @@ cvtScaleHalf_<short, float>( const short* src, size_t sstep, float* dst, size_t ...@@ -4599,6 +4601,7 @@ cvtScaleHalf_<short, float>( const short* src, size_t sstep, float* dst, size_t
{ {
CV_CPU_CALL_FP16(cvtScaleHalf_SIMD16f32f, (src, sstep, dst, dstep, size)); CV_CPU_CALL_FP16(cvtScaleHalf_SIMD16f32f, (src, sstep, dst, dstep, size));
#if !defined(CV_CPU_COMPILE_FP16)
sstep /= sizeof(src[0]); sstep /= sizeof(src[0]);
dstep /= sizeof(dst[0]); dstep /= sizeof(dst[0]);
...@@ -4609,6 +4612,7 @@ cvtScaleHalf_<short, float>( const short* src, size_t sstep, float* dst, size_t ...@@ -4609,6 +4612,7 @@ cvtScaleHalf_<short, float>( const short* src, size_t sstep, float* dst, size_t
dst[x] = convertFp16SW(src[x]); dst[x] = convertFp16SW(src[x]);
} }
} }
#endif
} }
#ifdef HAVE_OPENVX #ifdef HAVE_OPENVX
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment