Fixed a variety of warnings and an error for MSVC2013 compilation

2 files changed, 4 insertions, 3 deletions

diff --git a/test/routines/level2/xtrsv.hpp b/test/routines/level2/xtrsv.hpp
index aec8eace..81508236 100644
--- a/test/routines/level2/xtrsv.hpp
+++ b/test/routines/level2/xtrsv.hpp
@@ -74,7 +74,8 @@ class TestXtrsv {
     // TODO: Improve this, currently loosely based on clBLAS's implementation
     for (auto i = size_t{0}; i < args.n; ++i) {
       auto diagonal = a_source[i*args.a_ld + i + args.a_offset];
-      diagonal = static_cast<T>(AbsoluteValue(diagonal)) + static_cast<T>(args.n / size_t{4});
+      diagonal = static_cast<T>(AbsoluteValue(diagonal)) +
+                 Constant<T>(static_cast<double>(args.n / size_t{4}));
       for (auto j = size_t{0}; j < args.n; ++j) {
         a_source[j*args.a_ld + i + args.a_offset] /= Constant<T>(2.0);
       }
diff --git a/test/routines/levelx/xim2col.hpp b/test/routines/levelx/xim2col.hpp
index ebffe85e..abd6af86 100644
--- a/test/routines/levelx/xim2col.hpp
+++ b/test/routines/levelx/xim2col.hpp
@@ -165,8 +165,8 @@ StatusCode RunReference(const Arguments<T> &args, BuffersHost<T> &buffers_host)
           for (auto w_id = size_t{0}; w_id < output_w; ++w_id) { // image width
 
             // Retrieves the input value
-            const auto h_index = -args.pad_h + kh_id * args.dilation_h + args.stride_h * h_id;
-            const auto w_index = -args.pad_w + kw_id * args.dilation_w + args.stride_w * w_id;
+            const auto h_index = kh_id * args.dilation_h + args.stride_h * h_id - args.pad_h;
+            const auto w_index = kw_id * args.dilation_w + args.stride_w * w_id - args.pad_w;
             auto val = ConstantZero<T>();
             if (h_index >= 0 && h_index < args.height &&
                 w_index >= 0 && w_index < args.width) {