diff options
author | Pablo Tello <pablo.tello@arm.com> | 2018-08-07 11:23:54 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:54:54 +0000 |
commit | d8b03dd029261091e34dd8831d546299c60ce094 (patch) | |
tree | ced5c96940aa018f0a5a5a3a5fb0769d8dadcd1e /arm_compute/core/NEON/kernels/NEWarpKernel.h | |
parent | 7da6dcfc199580828dbedfed15afdcc7a789192c (diff) | |
download | ComputeLibrary-d8b03dd029261091e34dd8831d546299c60ce094.tar.gz |
MLCE-13: Sanitizing matrix argument in the Warp.
This changes help to prevent errors like passing a matrix
with less elements than required into the warp functions.
Change-Id: I863f933a5e0568258717cffed3a20788d3d03083
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/143044
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'arm_compute/core/NEON/kernels/NEWarpKernel.h')
-rw-r--r-- | arm_compute/core/NEON/kernels/NEWarpKernel.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arm_compute/core/NEON/kernels/NEWarpKernel.h b/arm_compute/core/NEON/kernels/NEWarpKernel.h index a147d57f28..879bc44d05 100644 --- a/arm_compute/core/NEON/kernels/NEWarpKernel.h +++ b/arm_compute/core/NEON/kernels/NEWarpKernel.h @@ -27,8 +27,8 @@ #include "arm_compute/core/NEON/INEKernel.h" #include "arm_compute/core/Types.h" +#include <array> #include <cstdint> - namespace arm_compute { class ITensor; @@ -52,10 +52,11 @@ public: * @param[in] input Source tensor. Data type supported: U8. * @param[out] output Destination tensor. Data type supported: U8. * @param[in] matrix The perspective or affine matrix to use. Must be 2x3 for affine and 3x3 for perspective of type float. + * The matrix argument requires 9 values, for the affine case the last 3 values are ignored. * @param[in] border_mode Strategy to use for borders * @param[in] constant_border_value Constant value used for filling the border. */ - virtual void configure(const ITensor *input, ITensor *output, const float *matrix, BorderMode border_mode, uint8_t constant_border_value); + virtual void configure(const ITensor *input, ITensor *output, const std::array<float, 9> &matrix, BorderMode border_mode, uint8_t constant_border_value); // Inherited methods overridden: void run(const Window &window, const ThreadInfo &info) override; @@ -88,7 +89,7 @@ protected: const ITensor *_input; /**< Input Tensor */ ITensor *_output; /**< Output Tensor */ uint8_t _constant_border_value; /**< Constant value used for filling the border. This value is used for those pixels out of the ROI when the border mode is CONSTANT */ - const float *_matrix; /**< The affine or perspective matrix. Must be 2x3 for warp affine or 3x3 for warp perspective of type float. */ + std::array<float, 9> _matrix; /**< The affine or perspective matrix. Must be 2x3 for warp affine or 3x3 for warp perspective of type float. */ }; /** Template interface for the kernel to compute warp affine |