From 94848a3e1ff43aec5c5173a9fe9ea34e685bd021 Mon Sep 17 00:00:00 2001 From: Tomoaki Teshima Date: Tue, 13 Jun 2017 08:11:04 +0900 Subject: [PATCH] suppress unreachable code warning - fix the define condition based on the comment --- modules/core/src/convert.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/core/src/convert.cpp b/modules/core/src/convert.cpp index afc3d3579b..94005d7151 100644 --- a/modules/core/src/convert.cpp +++ b/modules/core/src/convert.cpp @@ -4582,6 +4582,7 @@ cvtScaleHalf_( const float* src, size_t sstep, short* dst, size_t { CV_CPU_CALL_FP16(cvtScaleHalf_SIMD32f16f, (src, sstep, dst, dstep, size)); +#if !defined(CV_CPU_COMPILE_FP16) sstep /= sizeof(src[0]); dstep /= sizeof(dst[0]); @@ -4592,6 +4593,7 @@ cvtScaleHalf_( const float* src, size_t sstep, short* dst, size_t dst[x] = convertFp16SW(src[x]); } } +#endif } template<> void @@ -4599,6 +4601,7 @@ cvtScaleHalf_( const short* src, size_t sstep, float* dst, size_t { CV_CPU_CALL_FP16(cvtScaleHalf_SIMD16f32f, (src, sstep, dst, dstep, size)); +#if !defined(CV_CPU_COMPILE_FP16) sstep /= sizeof(src[0]); dstep /= sizeof(dst[0]); @@ -4609,6 +4612,7 @@ cvtScaleHalf_( const short* src, size_t sstep, float* dst, size_t dst[x] = convertFp16SW(src[x]); } } +#endif } #ifdef HAVE_OPENVX