generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #6951 from kurenai:fix_macro

Browse Source
This commit is contained in:
Alexander Alekhin 2016-07-19 14:05:17 +00:00
commit a2921fdede
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdparty/carotene/src/resize.cpp vendored
View File

@ -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)