diff options
| author | Diego Lopez Recas <Diego.LopezRecas@arm.com> | 2017-12-19 15:42:25 +0000 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:42:33 +0000 |
| commit | 490b3d839808cbd088ab567dec991dcefb08f718 (patch) | |
| tree | 72ddb43ddef562ffb3008d9e421b08c7ecab0c3a /src/core/NEON/kernels/NEWarpKernel.cpp | |
| parent | 53a6ec5944132000e2c6779c04d722b3b2d2501c (diff) | |
| download | ComputeLibrary-490b3d839808cbd088ab567dec991dcefb08f718.tar.gz | |
IVGCVSW-863 Move clamp, for_each, foldl to misc/utility.h
Also, improve for_each, foldl, and related changes.
Change-Id: I0cf0c7dbf88f26bb70cc734ba9fb5725d405585f
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/114014
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/core/NEON/kernels/NEWarpKernel.cpp')
| -rw-r--r-- | src/core/NEON/kernels/NEWarpKernel.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/core/NEON/kernels/NEWarpKernel.cpp b/src/core/NEON/kernels/NEWarpKernel.cpp index ab8ab14ae5..0fa8278fe3 100644 --- a/src/core/NEON/kernels/NEWarpKernel.cpp +++ b/src/core/NEON/kernels/NEWarpKernel.cpp @@ -287,10 +287,10 @@ void NEWarpAffineKernel<interpolation>::warp_constant(const Window &window) break; case InterpolationPolicy::BILINEAR: { - const auto xi = clamp<int>(std::floor(x0), min_x - 1, max_x); - const auto yi = clamp<int>(std::floor(y0), min_y - 1, max_y); - const auto xi_1 = clamp<int>(std::floor(x0 + 1), min_x - 1, max_x); - const auto yi_1 = clamp<int>(std::floor(y0 + 1), min_y - 1, max_y); + const auto xi = utility::clamp<int>(std::floor(x0), min_x - 1, max_x); + const auto yi = utility::clamp<int>(std::floor(y0), min_y - 1, max_y); + const auto xi_1 = utility::clamp<int>(std::floor(x0 + 1), min_x - 1, max_x); + const auto yi_1 = utility::clamp<int>(std::floor(y0 + 1), min_y - 1, max_y); const float dx = x0 - std::floor(x0); const float dy = y0 - std::floor(y0); @@ -396,8 +396,8 @@ void NEWarpAffineKernel<interpolation>::warp_replicate(const Window &window) else { // Clamp coordinates - const auto xi = clamp<int>(std::floor(x0), min_x, max_x - 1); - const auto yi = clamp<int>(std::floor(y0), min_y, max_y - 1); + const auto xi = utility::clamp<int>(std::floor(x0), min_x, max_x - 1); + const auto yi = utility::clamp<int>(std::floor(y0), min_y, max_y - 1); switch(interpolation) { case InterpolationPolicy::NEAREST_NEIGHBOR: @@ -405,8 +405,8 @@ void NEWarpAffineKernel<interpolation>::warp_replicate(const Window &window) break; case InterpolationPolicy::BILINEAR: { - const auto xi_1 = clamp<int>(std::floor(x0 + 1), min_x, max_x - 1); - const auto yi_1 = clamp<int>(std::floor(y0 + 1), min_y, max_y - 1); + const auto xi_1 = utility::clamp<int>(std::floor(x0 + 1), min_x, max_x - 1); + const auto yi_1 = utility::clamp<int>(std::floor(y0 + 1), min_y, max_y - 1); const float dx = x0 - std::floor(x0); const float dy = y0 - std::floor(y0); @@ -636,10 +636,10 @@ void NEWarpPerspectiveKernel<interpolation>::warp_constant(const Window &window) break; case InterpolationPolicy::BILINEAR: { - const auto xi = clamp<int>(std::floor(xn), min_x - 1, max_x); - const auto yi = clamp<int>(std::floor(yn), min_y - 1, max_y); - const auto xi_1 = clamp<int>(std::floor(xn + 1), min_x - 1, max_x); - const auto yi_1 = clamp<int>(std::floor(yn + 1), min_y - 1, max_y); + const auto xi = utility::clamp<int>(std::floor(xn), min_x - 1, max_x); + const auto yi = utility::clamp<int>(std::floor(yn), min_y - 1, max_y); + const auto xi_1 = utility::clamp<int>(std::floor(xn + 1), min_x - 1, max_x); + const auto yi_1 = utility::clamp<int>(std::floor(yn + 1), min_y - 1, max_y); const float dx = xn - std::floor(xn); const float dy = yn - std::floor(yn); @@ -762,8 +762,8 @@ void NEWarpPerspectiveKernel<interpolation>::warp_replicate(const Window &window else { // Clamp coordinates - const auto xi = clamp<int>(std::floor(xn), min_x, max_x - 1); - const auto yi = clamp<int>(std::floor(yn), min_y, max_y - 1); + const auto xi = utility::clamp<int>(std::floor(xn), min_x, max_x - 1); + const auto yi = utility::clamp<int>(std::floor(yn), min_y, max_y - 1); switch(interpolation) { case InterpolationPolicy::NEAREST_NEIGHBOR: @@ -771,8 +771,8 @@ void NEWarpPerspectiveKernel<interpolation>::warp_replicate(const Window &window break; case InterpolationPolicy::BILINEAR: { - const auto xi_1 = clamp<int>(std::floor(xn + 1), min_x, max_x - 1); - const auto yi_1 = clamp<int>(std::floor(yn + 1), min_y, max_y - 1); + const auto xi_1 = utility::clamp<int>(std::floor(xn + 1), min_x, max_x - 1); + const auto yi_1 = utility::clamp<int>(std::floor(yn + 1), min_y, max_y - 1); const float dx = xn - std::floor(xn); const float dy = yn - std::floor(yn); |