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/CL/functions/CLCannyEdge.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/CL/functions/CLCannyEdge.cpp')
-rw-r--r-- | src/runtime/CL/functions/CLCannyEdge.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/runtime/CL/functions/CLCannyEdge.cpp b/src/runtime/CL/functions/CLCannyEdge.cpp index 1d018b8347..6c321ad69a 100644 --- a/src/runtime/CL/functions/CLCannyEdge.cpp +++ b/src/runtime/CL/functions/CLCannyEdge.cpp @@ -26,12 +26,12 @@ #include "arm_compute/core/CL/ICLTensor.h" #include "arm_compute/core/CL/OpenCL.h" #include "arm_compute/core/Error.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/Validate.h" #include "arm_compute/runtime/CL/CLScheduler.h" #include "arm_compute/runtime/CL/functions/CLSobel3x3.h" #include "arm_compute/runtime/CL/functions/CLSobel5x5.h" #include "arm_compute/runtime/CL/functions/CLSobel7x7.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; @@ -86,19 +86,19 @@ void CLCannyEdge::configure(ICLTensor *input, ICLTensor *output, int32_t upper_t // Configure/Init sobelNxN if(gradient_size == 3) { - auto k = arm_compute::cpp14::make_unique<CLSobel3x3>(); + auto k = arm_compute::support::cpp14::make_unique<CLSobel3x3>(); k->configure(input, &_gx, &_gy, border_mode, constant_border_value); _sobel = std::move(k); } else if(gradient_size == 5) { - auto k = arm_compute::cpp14::make_unique<CLSobel5x5>(); + auto k = arm_compute::support::cpp14::make_unique<CLSobel5x5>(); k->configure(input, &_gx, &_gy, border_mode, constant_border_value); _sobel = std::move(k); } else if(gradient_size == 7) { - auto k = arm_compute::cpp14::make_unique<CLSobel7x7>(); + auto k = arm_compute::support::cpp14::make_unique<CLSobel7x7>(); k->configure(input, &_gx, &_gy, border_mode, constant_border_value); _sobel = std::move(k); } |