COMPMID-802 Fix NEIm2Col NHWC

Change-Id: I513e0199b6fa665c4a7d2a739f4871b4575ef347
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/128490
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Pablo Tello <pablo.tello@arm.com>
diff --git a/arm_compute/core/utils/misc/ShapeCalculator.h b/arm_compute/core/utils/misc/ShapeCalculator.h
index b91e52a..8d4c024 100644
--- a/arm_compute/core/utils/misc/ShapeCalculator.h
+++ b/arm_compute/core/utils/misc/ShapeCalculator.h
@@ -168,9 +168,9 @@
     const int        channel_idx = get_data_layout_dimension_index(data_layout, DataLayoutDimension::CHANNEL);
 
     std::pair<unsigned int, unsigned int> out_dims = scaled_dimensions(output_shape[width_idx], output_shape[height_idx], kernel_dims.width, kernel_dims.height, conv_info, dilation);
-    output_shape.set(width_idx, (output_shape[channel_idx] * kernel_dims.area() + (has_bias ? 1 : 0)));
-    output_shape.set(height_idx, (out_dims.first * out_dims.second));
-    output_shape.set(channel_idx, 1);
+    output_shape.set(0, (output_shape[channel_idx] * kernel_dims.area() + (has_bias ? 1 : 0)));
+    output_shape.set(1, (out_dims.first * out_dims.second));
+    output_shape.set(2, 1);
 
     return output_shape;
 }