Fix error when compiling with clang

Kurenai · Kurenai · commit 2dec662ebf29 · 2016-07-19T18:05:07.000+08:00
diff --git a/3rdparty/carotene/src/resize.cpp b/3rdparty/carotene/src/resize.cpp
@@ -432,7 +432,7 @@ inline void resizeAreaRounding(const Size2D &ssize, const Size2D &dsize,
                     vSum = vaddq_u16(vSum, vaddl_u8(vLane4.val[0], vLane4.val[1]));
                     vSum = vaddq_u16(vSum, vaddl_u8(vLane4.val[2], vLane4.val[3]));
 
-                    vst1_u8(dst_row + dj, areaDownsamplingDivision<opencv_like,4>(vSum));
+                    vst1_u8(dst_row + dj, (areaDownsamplingDivision<opencv_like,4>(vSum)));
                 }
 
                 for ( ; dj < dsize.width; ++dj, sj += 4)
@@ -706,7 +706,7 @@ inline void resizeAreaRounding(const Size2D &ssize, const Size2D &dsize,
                     uint16x8_t v_sum = vcombine_u16(vadd_u16(vget_low_u16(v_sum0), vget_high_u16(v_sum0)),
                                                     vadd_u16(vget_low_u16(v_sum1), vget_high_u16(v_sum1)));
 
-                    vst1_u8(dst_row + dj, areaDownsamplingDivision<opencv_like,4>(v_sum));
+                    vst1_u8(dst_row + dj, (areaDownsamplingDivision<opencv_like,4>(v_sum)));
                 }
 
                 for (size_t dwidth = dsize.width << 2; dj < dwidth; dj += 4, sj += 16)

Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,7 @@ inline void resizeAreaRounding(const Size2D &ssize, const Size2D &dsize,`
`432`	`432`	`vSum = vaddq_u16(vSum, vaddl_u8(vLane4.val[0], vLane4.val[1]));`
`433`	`433`	`vSum = vaddq_u16(vSum, vaddl_u8(vLane4.val[2], vLane4.val[3]));`
`434`	`434`
`435`		`- vst1_u8(dst_row + dj, areaDownsamplingDivision<opencv_like,4>(vSum));`
	`435`	`+ vst1_u8(dst_row + dj, (areaDownsamplingDivision<opencv_like,4>(vSum)));`
`436`	`436`	`}`
`437`	`437`
`438`	`438`	`for ( ; dj < dsize.width; ++dj, sj += 4)`
`@@ -706,7 +706,7 @@ inline void resizeAreaRounding(const Size2D &ssize, const Size2D &dsize,`
`706`	`706`	`uint16x8_t v_sum = vcombine_u16(vadd_u16(vget_low_u16(v_sum0), vget_high_u16(v_sum0)),`
`707`	`707`	`vadd_u16(vget_low_u16(v_sum1), vget_high_u16(v_sum1)));`
`708`	`708`
`709`		`- vst1_u8(dst_row + dj, areaDownsamplingDivision<opencv_like,4>(v_sum));`
	`709`	`+ vst1_u8(dst_row + dj, (areaDownsamplingDivision<opencv_like,4>(v_sum)));`
`710`	`710`	`}`
`711`	`711`
`712`	`712`	`for (size_t dwidth = dsize.width << 2; dj < dwidth; dj += 4, sj += 16)`