Commit c47a6af1 authored by Michael Zbyszyński's avatar Michael Zbyszyński
Browse files

fixing implicit conversions

parent d80dba53
......@@ -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);
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment