From f4ebb175c691429d827e9d2ce1352078d70493d3 Mon Sep 17 00:00:00 2001 From: samcake Date: Fri, 11 Jul 2014 11:35:42 -0700 Subject: [PATCH] Fix bad casting syntax - Reverse the casting that i added to stop warning, works on windows but not on mac :( --- interface/src/devices/DeviceTracker.cpp | 2 +- interface/src/devices/MotionTracker.cpp | 2 +- interface/src/devices/MotionTracker.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/src/devices/DeviceTracker.cpp b/interface/src/devices/DeviceTracker.cpp index da4abe6c45..47301ad826 100644 --- a/interface/src/devices/DeviceTracker.cpp +++ b/interface/src/devices/DeviceTracker.cpp @@ -38,7 +38,7 @@ DeviceTracker* DeviceTracker::getDevice(const Name& name) { } DeviceTracker* DeviceTracker::getDevice(DeviceTracker::ID deviceID) { - if ((deviceID >= 0) && (unsigned int(deviceID) < Singleton::get()->_devicesVector.size())) { + if ((deviceID >= 0) && (deviceID < Singleton::get()->_devicesVector.size())) { return Singleton::get()->_devicesVector[ deviceID ]; } else { return NULL; diff --git a/interface/src/devices/MotionTracker.cpp b/interface/src/devices/MotionTracker.cpp index 5ab2f4a23e..fe41f89a07 100644 --- a/interface/src/devices/MotionTracker.cpp +++ b/interface/src/devices/MotionTracker.cpp @@ -106,7 +106,7 @@ void MotionTracker::updateAllAbsTransform() { _jointsArray[0].updateAbsFromLocTransform(0); // Because we know the hierarchy is stored from root down the branches let's just traverse and update - for (Index i = 1; unsigned int(i) < _jointsArray.size(); i++) { + for (Index i = 1; i < _jointsArray.size(); i++) { JointTracker* joint = _jointsArray.data() + i; joint->updateAbsFromLocTransform(_jointsArray.data() + joint->getParent()); } diff --git a/interface/src/devices/MotionTracker.h b/interface/src/devices/MotionTracker.h index 1c5e3b9f33..a8c0395359 100644 --- a/interface/src/devices/MotionTracker.h +++ b/interface/src/devices/MotionTracker.h @@ -84,8 +84,8 @@ public: /// Access a Joint from it's index. /// Index 0 is always the "Root". /// if the index is Invalid then returns NULL. - const JointTracker* getJointTracker(Index index) const { return ((index > 0) && (unsigned int(index) < _jointsArray.size())) ? _jointsArray.data() + index : NULL); } - JointTracker* editJointTracker(Index index) { return ((index > 0) && (unsigned int(index) < _jointsArray.size())) ? _jointsArray.data() + index : NULL); } + const JointTracker* getJointTracker(Index index) const { return ((index > 0) && (index < _jointsArray.size()) ? _jointsArray.data() + index : NULL); } + JointTracker* editJointTracker(Index index) { return ((index > 0) && (index < _jointsArray.size()) ? _jointsArray.data() + index : NULL); } /// From a semantic, find the Index of the Joint. /// \return the index of the mapped Joint or INVALID_SEMANTIC if the semantic is not knowned.