Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 05:17:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

uint32_t rather than uint, which mac doesn't like

Browse source
This commit is contained in:
Seth Alves 2015-02-04 11:26:05 -08:00
parent 450787fde2
commit a645d784d8
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Audio.h
View file

@ -212,7 +212,7 @@ private:
bool _outputStarveDetectionEnabled; bool _outputStarveDetectionEnabled;
quint64 _outputStarveDetectionStartTimeMsec; quint64 _outputStarveDetectionStartTimeMsec;
int _outputStarveDetectionCount; int _outputStarveDetectionCount;
uint _outputStarveDetectionPeriodMsec; uint32_t _outputStarveDetectionPeriodMsec;
int _outputStarveDetectionThreshold; // Maximum number of starves per _outputStarveDetectionPeriod before increasing buffer size int _outputStarveDetectionThreshold; // Maximum number of starves per _outputStarveDetectionPeriod before increasing buffer size

2
interface/src/devices/MotionTracker.h
View file

@ -37,7 +37,7 @@ public:
// Semantic and Index types to retreive the JointTrackers of this MotionTracker // Semantic and Index types to retreive the JointTrackers of this MotionTracker
typedef std::string Semantic; typedef std::string Semantic;
typedef uint Index; typedef uint32_t Index;
static const Index INVALID_SEMANTIC = -1; static const Index INVALID_SEMANTIC = -1;
static const Index INVALID_PARENT = -2; static const Index INVALID_PARENT = -2;

2
libraries/audio/src/AudioFilterBank.h
View file

@ -52,7 +52,7 @@ public:
AudioFilterBank() : AudioFilterBank() :
_sampleRate(0.0f), _sampleRate(0.0f),
_frameCount(0) { _frameCount(0) {
for (int i = 0; i < _channelCount; ++i) { for (uint32_t i = 0; i < _channelCount; ++i) {
_buffer[ i ] = NULL; _buffer[ i ] = NULL;
} }
} }

2
libraries/gpu/src/gpu/Texture.cpp
View file

@ -175,7 +175,7 @@ Texture::Size Texture::resize(Type type, const Element& texelFormat, uint16 widt
// Evaluate the new size with the new format // Evaluate the new size with the new format
const int DIM_SIZE[] = {1, 1, 1, 6}; const int DIM_SIZE[] = {1, 1, 1, 6};
uint size = DIM_SIZE[_type] *_width * _height * _depth * _numSamples * texelFormat.getSize(); uint32_t size = DIM_SIZE[_type] *_width * _height * _depth * _numSamples * texelFormat.getSize();
// If size change then we need to reset // If size change then we need to reset
if (changed || (size != getSize())) { if (changed || (size != getSize())) {