From c1ae98fa1ad5595ba8c8729f642a80c2e0583860 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 2 Feb 2015 15:02:29 -0800 Subject: [PATCH] quiet some compiler warnings about signed vs unsigned comparisons --- interface/src/Audio.h | 2 +- interface/src/devices/MotionTracker.h | 2 +- interface/src/scripting/ControllerScriptingInterface.h | 2 +- libraries/gpu/src/gpu/Texture.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/src/Audio.h b/interface/src/Audio.h index d815b3035c..be374de959 100644 --- a/interface/src/Audio.h +++ b/interface/src/Audio.h @@ -212,7 +212,7 @@ private: bool _outputStarveDetectionEnabled; quint64 _outputStarveDetectionStartTimeMsec; int _outputStarveDetectionCount; - int _outputStarveDetectionPeriodMsec; + uint _outputStarveDetectionPeriodMsec; int _outputStarveDetectionThreshold; // Maximum number of starves per _outputStarveDetectionPeriod before increasing buffer size diff --git a/interface/src/devices/MotionTracker.h b/interface/src/devices/MotionTracker.h index 42ddc6768c..84b909d4fd 100644 --- a/interface/src/devices/MotionTracker.h +++ b/interface/src/devices/MotionTracker.h @@ -37,7 +37,7 @@ public: // Semantic and Index types to retreive the JointTrackers of this MotionTracker typedef std::string Semantic; - typedef int Index; + typedef uint Index; static const Index INVALID_SEMANTIC = -1; static const Index INVALID_PARENT = -2; diff --git a/interface/src/scripting/ControllerScriptingInterface.h b/interface/src/scripting/ControllerScriptingInterface.h index 29921008e6..d56d159c06 100644 --- a/interface/src/scripting/ControllerScriptingInterface.h +++ b/interface/src/scripting/ControllerScriptingInterface.h @@ -38,7 +38,7 @@ public slots: private: int _deviceTrackerId; - int _subTrackerId; + uint _subTrackerId; // cache for the spatial SpatialEvent _eventCache; diff --git a/libraries/gpu/src/gpu/Texture.cpp b/libraries/gpu/src/gpu/Texture.cpp index f9fbcb72df..7615c599b0 100755 --- a/libraries/gpu/src/gpu/Texture.cpp +++ b/libraries/gpu/src/gpu/Texture.cpp @@ -175,7 +175,7 @@ Texture::Size Texture::resize(Type type, const Element& texelFormat, uint16 widt // Evaluate the new size with the new format const int DIM_SIZE[] = {1, 1, 1, 6}; - int size = DIM_SIZE[_type] *_width * _height * _depth * _numSamples * texelFormat.getSize(); + uint size = DIM_SIZE[_type] *_width * _height * _depth * _numSamples * texelFormat.getSize(); // If size change then we need to reset if (changed || (size != getSize())) {