From c47a6af1d8bb64d3b118bed28d54b7fb1dbf9b21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Zbyszy=C5=84ski?= <m.zbyszynski@gold.ac.uk>
Date: Mon, 20 Nov 2017 12:31:44 +0000
Subject: [PATCH] fixing implicit conversions
---
dependencies/GVF/GVF.cpp | 2 +-
dependencies/GVF/GVFUtils.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dependencies/GVF/GVF.cpp b/dependencies/GVF/GVF.cpp
index 36ef7d5..4571a5a 100755
--- a/dependencies/GVF/GVF.cpp
+++ b/dependencies/GVF/GVF.cpp
@@ -192,7 +192,7 @@ void GVF::addGestureTemplate(GVFGesture & gestureTemplate)
config.inputDimensions = inputDimension;
gestureTemplates.push_back(gestureTemplate);
- activeGestures.push_back(gestureTemplates.size());
+ activeGestures.push_back(int(gestureTemplates.size()));
if(minRange.size() == 0){
minRange.resize(inputDimension);
diff --git a/dependencies/GVF/GVFUtils.h b/dependencies/GVF/GVFUtils.h
index 28c5270..2ae44c2 100755
--- a/dependencies/GVF/GVFUtils.h
+++ b/dependencies/GVF/GVFUtils.h
@@ -225,7 +225,7 @@ template <typename T>
inline vector<T> multiplyMat(vector< vector<T> > & M1, vector< T> & Vect){
assert(Vect.size() == M1[0].size()); // columns in M1 == rows in Vect
vector<T> multiply;
- initVec(multiply, Vect.size());
+ initVec(multiply, int(Vect.size()));
for (int i=0; i<M1.size(); i++){
multiply[i] = 0.0f;
for (int j=0; j<M1[i].size(); j++){
@@ -269,7 +269,7 @@ inline vector<vector<float> > getRotationMatrix3d(T phi, T theta, T psi)
template <typename T>
float distance_weightedEuclidean(vector<T> x, vector<T> y, vector<T> w)
{
- int count = x.size();
+ int count = int(x.size());
if (count <= 0) return 0;
float dist = 0.0;
for(int k = 0; k < count; k++) dist += w[k] * pow((x[k] - y[k]), 2);
--
GitLab