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>

diff --git a/src/qml/jsruntime/qv4typedarray.cpp b/src/qml/jsruntime/qv4typedarray.cpp
index 429ec96f0b40fe01c531757d39258c22b158d088..c355207d947fd965787a8683da718cc81c8c1003 100644 (file)
--- 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 85a03fb57b3c31ec9900efed2ca61517485d6277..aaed4bd60e241a160f9b7d75c764c09dd4cc418a 100644 (file)
--- 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;