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

Merge pull request #3371 from ZappoMan/warningFixes

Browse source 
fix some recently introduced warnings
This commit is contained in:
Clément Brisset 2014-09-06 19:01:56 -07:00
commit dc59cd4bb6
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -88,7 +88,6 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNam
_isRunning(false),
_isInitialized(false),
_isAvatar(false),
_isUserLoaded(false),
_avatarIdentityTimer(NULL),
_avatarBillboardTimer(NULL),
_timerFunctionMap(),
@ -103,6 +102,7 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNam
_vec3Library(),
_uuidLibrary(),
_animationCache(this),
_isUserLoaded(false),
_arrayBufferClass(new ArrayBufferClass(this))
{
}
@ -114,7 +114,6 @@ ScriptEngine::ScriptEngine(const QUrl& scriptURL,
_isRunning(false),
_isInitialized(false),
_isAvatar(false),
_isUserLoaded(false),
_avatarIdentityTimer(NULL),
_avatarBillboardTimer(NULL),
_timerFunctionMap(),
@ -129,6 +128,7 @@ ScriptEngine::ScriptEngine(const QUrl& scriptURL,
_vec3Library(),
_uuidLibrary(),
_animationCache(this),
_isUserLoaded(false),
_arrayBufferClass(new ArrayBufferClass(this))
{
QString scriptURLString = scriptURL.toString();

2
libraries/script-engine/src/TypedArrays.cpp
View file

@ -158,7 +158,7 @@ QScriptClass::QueryFlags TypedArray::queryProperty(const QScriptValue& object,
quint32 pos = name.toArrayIndex(&ok);
// Check that name is a valid index and arrayBuffer exists
if (ok && pos >= 0 && pos < length) {
if (ok && pos < length) {
*id = byteOffset + pos * _bytesPerElement; // save pos to avoid recomputation
return HandlesReadAccess | HandlesWriteAccess; // Read/Write access
}