COMPMID-417 Fix bare metal build for armv7a

Change-Id: I566a41061b75c3a1dad5374fcdc84372e6cfbe89
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/89670
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
diff --git a/src/core/NEON/kernels/NELKTrackerKernel.cpp b/src/core/NEON/kernels/NELKTrackerKernel.cpp
index 6fac797..004ecd0 100644
--- a/src/core/NEON/kernels/NELKTrackerKernel.cpp
+++ b/src/core/NEON/kernels/NELKTrackerKernel.cpp
@@ -130,7 +130,7 @@
     }
 }
 
-std::tuple<int, int, int> NELKTrackerKernel::compute_spatial_gradient_matrix(const NELKInternalKeypoint &keypoint, int *bilinear_ix, int *bilinear_iy)
+std::tuple<int, int, int> NELKTrackerKernel::compute_spatial_gradient_matrix(const NELKInternalKeypoint &keypoint, int32_t *bilinear_ix, int32_t *bilinear_iy)
 {
     int iA11 = 0;
     int iA12 = 0;
@@ -218,7 +218,8 @@
     return std::make_tuple(iA11, iA12, iA22);
 }
 
-std::pair<int, int> NELKTrackerKernel::compute_image_mismatch_vector(const NELKInternalKeypoint &old_keypoint, const NELKInternalKeypoint &new_keypoint, const int *bilinear_ix, const int *bilinear_iy)
+std::pair<int, int> NELKTrackerKernel::compute_image_mismatch_vector(const NELKInternalKeypoint &old_keypoint, const NELKInternalKeypoint &new_keypoint, const int32_t *bilinear_ix,
+                                                                     const int32_t *bilinear_iy)
 {
     int ib1 = 0;
     int ib2 = 0;
@@ -402,8 +403,8 @@
     init_keypoints(list_start, list_end);
 
     const int buffer_size = _window_dimension * _window_dimension;
-    int       bilinear_ix[buffer_size];
-    int       bilinear_iy[buffer_size];
+    int32_t   bilinear_ix[buffer_size];
+    int32_t   bilinear_iy[buffer_size];
 
     const int half_window = _window_dimension / 2;