From 374841cbd973d8e321d7d218f6a508dab116b67e Mon Sep 17 00:00:00 2001
From: "xiang.zhang" <xiang.zhang@verisilicon.com>
Date: Tue, 7 Sep 2021 14:45:23 +0800
Subject: [PATCH] Fix build error with Android NDK

Verified with android ndk r22b

Signed-off-by: xiang.zhang <xiang.zhang@verisilicon.com>
---
 CMakeLists.txt          | 4 +++-
 src/tim/vx/test_utils.h | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42ba4f6..13cdf22 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,4 +65,6 @@ include_directories(${OVXDRV_INCLUDE_DIRS})
 add_subdirectory("src/tim/")
 add_subdirectory("samples/benchmark_test")
 add_subdirectory("samples/lenet")
-add_subdirectory("samples/multi_thread_test")
+if(NOT ANDROID_TOOLCHAIN)
+    add_subdirectory("samples/multi_thread_test")
+endif()
diff --git a/src/tim/vx/test_utils.h b/src/tim/vx/test_utils.h
index e1e81af..f2493eb 100644
--- a/src/tim/vx/test_utils.h
+++ b/src/tim/vx/test_utils.h
@@ -92,7 +92,7 @@ inline std::vector<T> Quantize(const std::vector<float>& data, float scale,
   for (const auto& f : data) {
     q.push_back(static_cast<T>(std::max<float>(
         std::numeric_limits<T>::min(),
-        std::min<float>(std::numeric_limits<T>::max(),
+        std::min<float>(static_cast<float>(std::numeric_limits<T>::max()),
                         std::round(zero_point + (f / scale))))));
   }
   return q;