summaryrefslogtreecommitdiffstats
path: root/src/gui/opengl/qtriangulatingstroker.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <[email protected]>2015-07-31 15:57:12 +0200
committerLaszlo Agocs <[email protected]>2015-08-03 20:15:30 +0000
commit44520dfff6fcf50941b13d1b8cf6c81fb94f85af (patch)
treedf6f2cba6a58943d0c5a6fc9b70fbf1fde050b5c /src/gui/opengl/qtriangulatingstroker.cpp
parent7b77ef6b0a28886296e8a551339eb2874470bfc2 (diff)
QtGui/QtOpenGL: Fix compiler warnings by MSVC2015 (64bit).
opengl\qtriangulatingstroker.cpp(130): warning C4305: '=': truncation from 'double' to 'float' opengl\qtriangulatingstroker.cpp(546): warning C4305: '=': truncation from 'double' to 'float' opengl\qopenglshaderprogram.cpp(1779): warning C4312: 'reinterpret_cast': conversion from 'int' to 'const void *' of greater size qglshaderprogram.cpp(1709): warning C4312: 'reinterpret_cast': conversion from 'int' to 'const void *' of greater size Change-Id: If1de629aada308d18c3641b504d74d3294b1e8bf Reviewed-by: Laszlo Agocs <[email protected]>
Diffstat (limited to 'src/gui/opengl/qtriangulatingstroker.cpp')
-rw-r--r--src/gui/opengl/qtriangulatingstroker.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/opengl/qtriangulatingstroker.cpp b/src/gui/opengl/qtriangulatingstroker.cpp
index cfbf8a75c54..5967bd6e89b 100644
--- a/src/gui/opengl/qtriangulatingstroker.cpp
+++ b/src/gui/opengl/qtriangulatingstroker.cpp
@@ -127,7 +127,7 @@ void QTriangulatingStroker::process(const QVectorPath &path, const QPen &pen, co
m_roundness = 1;
} else if (cosmetic) {
m_curvyness_add = realWidth / 2;
- m_curvyness_mul = CURVE_FLATNESS;
+ m_curvyness_mul = float(CURVE_FLATNESS);
m_roundness = qMax<int>(4, realWidth * CURVE_FLATNESS);
} else {
m_curvyness_add = m_width;
@@ -543,7 +543,7 @@ void QDashedStrokeProcessor::process(const QVectorPath &path, const QPen &pen, c
curvynessMul = CURVE_FLATNESS / m_inv_scale;
} else if (cosmetic) {
curvynessAdd= width / 2;
- curvynessMul= CURVE_FLATNESS;
+ curvynessMul= float(CURVE_FLATNESS);
} else {
curvynessAdd = width * m_inv_scale;
curvynessMul = CURVE_FLATNESS / m_inv_scale;