From 83dc96a91ba15408d045993689adbad3d57c1ad1 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Thu, 3 Oct 2019 12:55:20 +0300
Subject: [PATCH] Fix debug build

---
 components/common/cpp/include/ftl/traits.hpp | 48 ++++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/components/common/cpp/include/ftl/traits.hpp b/components/common/cpp/include/ftl/traits.hpp
index 6ac54e8e6..71668359d 100644
--- a/components/common/cpp/include/ftl/traits.hpp
+++ b/components/common/cpp/include/ftl/traits.hpp
@@ -13,30 +13,30 @@ struct AlwaysFalse : std::false_type {};
 template <typename T> struct OpenCVType {
 	static_assert(AlwaysFalse<T>::value, "Not a valid format type");
 };
-template <> struct OpenCVType<uchar> { static const int value = CV_8UC1; };
-template <> struct OpenCVType<uchar2> { static const int value = CV_8UC2; };
-template <> struct OpenCVType<uchar3> { static const int value = CV_8UC3; };
-template <> struct OpenCVType<uchar4> { static const int value = CV_8UC4; };
-template <> struct OpenCVType<char> { static const int value = CV_8SC1; };
-template <> struct OpenCVType<char2> { static const int value = CV_8SC2; };
-template <> struct OpenCVType<char3> { static const int value = CV_8SC3; };
-template <> struct OpenCVType<char4> { static const int value = CV_8SC4; };
-template <> struct OpenCVType<ushort> { static const int value = CV_16UC1; };
-template <> struct OpenCVType<ushort2> { static const int value = CV_16UC2; };
-template <> struct OpenCVType<ushort3> { static const int value = CV_16UC3; };
-template <> struct OpenCVType<ushort4> { static const int value = CV_16UC4; };
-template <> struct OpenCVType<short> { static const int value = CV_16SC1; };
-template <> struct OpenCVType<short2> { static const int value = CV_16SC2; };
-template <> struct OpenCVType<short3> { static const int value = CV_16SC3; };
-template <> struct OpenCVType<short4> { static const int value = CV_16SC4; };
-template <> struct OpenCVType<int> { static const int value = CV_32SC1; };
-template <> struct OpenCVType<int2> { static const int value = CV_32SC2; };
-template <> struct OpenCVType<int3> { static const int value = CV_32SC3; };
-template <> struct OpenCVType<int4> { static const int value = CV_32SC4; };
-template <> struct OpenCVType<float> { static const int value = CV_32FC1; };
-template <> struct OpenCVType<float2> { static const int value = CV_32FC2; };
-template <> struct OpenCVType<float3> { static const int value = CV_32FC3; };
-template <> struct OpenCVType<float4> { static const int value = CV_32FC4; };
+template <> struct OpenCVType<uchar> { static constexpr int value = CV_8UC1; };
+template <> struct OpenCVType<uchar2> { static constexpr int value = CV_8UC2; };
+template <> struct OpenCVType<uchar3> { static constexpr int value = CV_8UC3; };
+template <> struct OpenCVType<uchar4> { static constexpr int value = CV_8UC4; };
+template <> struct OpenCVType<char> { static constexpr int value = CV_8SC1; };
+template <> struct OpenCVType<char2> { static constexpr int value = CV_8SC2; };
+template <> struct OpenCVType<char3> { static constexpr int value = CV_8SC3; };
+template <> struct OpenCVType<char4> { static constexpr int value = CV_8SC4; };
+template <> struct OpenCVType<ushort> { static constexpr int value = CV_16UC1; };
+template <> struct OpenCVType<ushort2> { static constexpr int value = CV_16UC2; };
+template <> struct OpenCVType<ushort3> { static constexpr int value = CV_16UC3; };
+template <> struct OpenCVType<ushort4> { static constexpr int value = CV_16UC4; };
+template <> struct OpenCVType<short> { static constexpr int value = CV_16SC1; };
+template <> struct OpenCVType<short2> { static constexpr int value = CV_16SC2; };
+template <> struct OpenCVType<short3> { static constexpr int value = CV_16SC3; };
+template <> struct OpenCVType<short4> { static constexpr int value = CV_16SC4; };
+template <> struct OpenCVType<int> { static constexpr int value = CV_32SC1; };
+template <> struct OpenCVType<int2> { static constexpr int value = CV_32SC2; };
+template <> struct OpenCVType<int3> { static constexpr int value = CV_32SC3; };
+template <> struct OpenCVType<int4> { static constexpr int value = CV_32SC4; };
+template <> struct OpenCVType<float> { static constexpr int value = CV_32FC1; };
+template <> struct OpenCVType<float2> { static constexpr int value = CV_32FC2; };
+template <> struct OpenCVType<float3> { static constexpr int value = CV_32FC3; };
+template <> struct OpenCVType<float4> { static constexpr int value = CV_32FC4; };
 
 }
 }
-- 
GitLab