diff options
| author | Moritz Pflanzer <moritz.pflanzer@arm.com> | 2017-06-29 14:51:57 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-09-17 14:15:39 +0100 |
| commit | d0ae8b8ac8a371fd552c46d4b3be3db8628a5ade (patch) | |
| tree | e4b035d01add61c37fcbeaf38a6a54e550235d8f /src/runtime/NEON/functions/NEOpticalFlow.cpp | |
| parent | 5cb4c42cb5d781a44409ebc97a408e1379ce182d (diff) | |
| download | ComputeLibrary-d0ae8b8ac8a371fd552c46d4b3be3db8628a5ade.tar.gz | |
COMPMID-417: Extract common toolchain support file
The support file is needed as Android toolchains are missing some C++11
functions. It further includes functions that have been introduced in
C++14 but which we already need.
Eventually the support file might become unnecessary if the Android
compilers improve and we switch to C++14.
Change-Id: Ib5ec506f1a17c78149c315ab2096b901b852c180
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/79247
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Pablo Tello <pablo.tello@arm.com>
Diffstat (limited to 'src/runtime/NEON/functions/NEOpticalFlow.cpp')
| -rw-r--r-- | src/runtime/NEON/functions/NEOpticalFlow.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/runtime/NEON/functions/NEOpticalFlow.cpp b/src/runtime/NEON/functions/NEOpticalFlow.cpp index 49135e442c..d851e9a62b 100644 --- a/src/runtime/NEON/functions/NEOpticalFlow.cpp +++ b/src/runtime/NEON/functions/NEOpticalFlow.cpp @@ -24,7 +24,6 @@ #include "arm_compute/runtime/NEON/functions/NEOpticalFlow.h" #include "arm_compute/core/Error.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/ITensor.h" #include "arm_compute/core/NEON/kernels/NELKTrackerKernel.h" #include "arm_compute/core/TensorInfo.h" @@ -34,6 +33,7 @@ #include "arm_compute/runtime/Pyramid.h" #include "arm_compute/runtime/Tensor.h" #include "arm_compute/runtime/TensorAllocator.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; @@ -65,10 +65,10 @@ void NEOpticalFlow::configure(const Pyramid *old_pyramid, const Pyramid *new_pyr const float pyr_scale = old_pyramid->info()->scale(); - _func_scharr = arm_compute::cpp14::make_unique<NEScharr3x3[]>(_num_levels); - _kernel_tracker = arm_compute::cpp14::make_unique<NELKTrackerKernel[]>(_num_levels); - _scharr_gx = arm_compute::cpp14::make_unique<Tensor[]>(_num_levels); - _scharr_gy = arm_compute::cpp14::make_unique<Tensor[]>(_num_levels); + _func_scharr = arm_compute::support::cpp14::make_unique<NEScharr3x3[]>(_num_levels); + _kernel_tracker = arm_compute::support::cpp14::make_unique<NELKTrackerKernel[]>(_num_levels); + _scharr_gx = arm_compute::support::cpp14::make_unique<Tensor[]>(_num_levels); + _scharr_gy = arm_compute::support::cpp14::make_unique<Tensor[]>(_num_levels); _old_points_internal = LKInternalKeypointArray(old_points->num_values()); _new_points_internal = LKInternalKeypointArray(old_points->num_values()); |