diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-03-27 22:12:56 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-07-07 16:16:46 +0000 |
| commit | c802a8582258ca9ad1cc800a9c8e6e46b2ff6f0e (patch) | |
| tree | c152cfb2b58eb1f7af0ab18979bb15ca2be367bc /src | |
| parent | 982fa2225b7d69181344a00816cad19042a922e6 (diff) | |
Fix ICC warning about change of sign
qv4typedarray.cpp(87): error #68: integer conversion resulted in a change of sign
Change-Id: Iee8cbc07c4434ce9b560ffff13cf917dd8f9012e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/jsruntime/qv4typedarray.cpp | 2 | ||||
| -rw-r--r-- | src/quick/util/qquickprofiler_p.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4typedarray.cpp b/src/qml/jsruntime/qv4typedarray.cpp index 429ec96f0b..c355207d94 100644 --- a/src/qml/jsruntime/qv4typedarray.cpp +++ b/src/qml/jsruntime/qv4typedarray.cpp @@ -84,7 +84,7 @@ void UInt8ClampedArrayWrite(ExecutionEngine *e, char *data, int index, const Val return; } if (d >= 255) { - data[index] = (unsigned char)(255); + data[index] = (char)(255); return; } double f = std::floor(d); diff --git a/src/quick/util/qquickprofiler_p.h b/src/quick/util/qquickprofiler_p.h index 85a03fb57b..aaed4bd60e 100644 --- a/src/quick/util/qquickprofiler_p.h +++ b/src/quick/util/qquickprofiler_p.h @@ -259,7 +259,7 @@ public: } template<SceneGraphFrameType FrameType, bool Record> - static void reportSceneGraphFrame(quint64 payload = -1) + static void reportSceneGraphFrame(quint64 payload = ~0) { qint64 *timings = s_instance->m_sceneGraphData.timings<FrameType>(); int &offset = s_instance->m_sceneGraphData.offset<FrameType>(); @@ -275,7 +275,7 @@ public: } template<SceneGraphFrameType FrameType, bool Record, SceneGraphFrameType SwitchTo> - static void reportSceneGraphFrame(quint64 payload = -1) + static void reportSceneGraphFrame(quint64 payload = ~0) { reportSceneGraphFrame<FrameType, Record>(payload); s_instance->m_sceneGraphData.offset<SwitchTo>() = 0; |