suppress unreachable code warning

tomoaki0705 · tomoaki0705 · commit 94848a3e1ff4 · 2017-06-13T08:11:04.000+09:00
- fix the define condition based on the comment
diff --git a/modules/core/src/convert.cpp b/modules/core/src/convert.cpp
@@ -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));
 
+#if !defined(CV_CPU_COMPILE_FP16)
     sstep /= sizeof(src[0]);
     dstep /= sizeof(dst[0]);
 
@@ -4592,13 +4593,15 @@ cvtScaleHalf_<float, short>( const float* src, size_t sstep, short* dst, size_t
             dst[x] = convertFp16SW(src[x]);
         }
     }
+#endif
 }
 
 template<> void
 cvtScaleHalf_<short, float>( const short* src, size_t sstep, float* dst, size_t dstep, Size size )
 {
     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_<short, float>( const short* src, size_t sstep, float* dst, size_t
             dst[x] = convertFp16SW(src[x]);
         }
     }
+#endif
 }
 
 #ifdef HAVE_OPENVX

Original file line number	Diff line number	Diff line change
`@@ -4582,6 +4582,7 @@ cvtScaleHalf_<float, short>( const float* src, size_t sstep, short* dst, size_t`
`4582`	`4582`	`{`
`4583`	`4583`	`CV_CPU_CALL_FP16(cvtScaleHalf_SIMD32f16f, (src, sstep, dst, dstep, size));`
`4584`	`4584`
	`4585`	`+#if !defined(CV_CPU_COMPILE_FP16)`
`4585`	`4586`	`sstep /= sizeof(src[0]);`
`4586`	`4587`	`dstep /= sizeof(dst[0]);`
`4587`	`4588`
`@@ -4592,13 +4593,15 @@ cvtScaleHalf_<float, short>( const float* src, size_t sstep, short* dst, size_t`
`4592`	`4593`	`dst[x] = convertFp16SW(src[x]);`
`4593`	`4594`	`}`
`4594`	`4595`	`}`
	`4596`	`+#endif`
`4595`	`4597`	`}`
`4596`	`4598`
`4597`	`4599`	`template<> void`
`4598`	`4600`	`cvtScaleHalf_<short, float>( const short* src, size_t sstep, float* dst, size_t dstep, Size size )`
`4599`	`4601`	`{`
`4600`	`4602`	`CV_CPU_CALL_FP16(cvtScaleHalf_SIMD16f32f, (src, sstep, dst, dstep, size));`
`4601`	`4603`
	`4604`	`+#if !defined(CV_CPU_COMPILE_FP16)`
`4602`	`4605`	`sstep /= sizeof(src[0]);`
`4603`	`4606`	`dstep /= sizeof(dst[0]);`
`4604`	`4607`
`@@ -4609,6 +4612,7 @@ cvtScaleHalf_<short, float>( const short* src, size_t sstep, float* dst, size_t`
`4609`	`4612`	`dst[x] = convertFp16SW(src[x]);`
`4610`	`4613`	`}`
`4611`	`4614`	`}`
	`4615`	`+#endif`
`4612`	`4616`	`}`
`4613`	`4617`
`4614`	`4618`	`#ifdef HAVE_OPENVX`