diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-27 16:16:16 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-27 16:35:12 +0200 |
commit | 434824aede28e8c36d6991aa218f89daf2cc22fa (patch) | |
tree | f00760a20a065e5a70d722bd06411c4348c49e16 /src/gui/opengl/qopengltriangulatingstroker.cpp | |
parent | d2aaa13820e400de73e3b0a12af6b7b7c6393d32 (diff) |
Fix compiler warnings.
- Fix gcc 4.6.X warnings about assigned but unused variables
- Remove trailing ';' from inline functions (Clang)
Change-Id: I8670afd6b149748a740f22c65de137762e9f18e1
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/gui/opengl/qopengltriangulatingstroker.cpp')
-rw-r--r-- | src/gui/opengl/qopengltriangulatingstroker.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/gui/opengl/qopengltriangulatingstroker.cpp b/src/gui/opengl/qopengltriangulatingstroker.cpp index 3dc3452b60..4d1a8f86b2 100644 --- a/src/gui/opengl/qopengltriangulatingstroker.cpp +++ b/src/gui/opengl/qopengltriangulatingstroker.cpp @@ -513,21 +513,18 @@ void QDashedStrokeProcessor::process(const QVectorPath &path, const QPen &pen, c m_dash_stroker.setMiterLimit(pen.miterLimit()); m_dash_stroker.setClipRect(clip); - float curvynessAdd, curvynessMul, roundness = 0; + float curvynessAdd, curvynessMul; - // simplfy pens that are thin in device size (2px wide or less) + // simplify pens that are thin in device size (2px wide or less) if (width < 2.5 && (cosmetic || m_inv_scale == 1)) { curvynessAdd = 0.5; curvynessMul = CURVE_FLATNESS / m_inv_scale; - roundness = 1; } else if (cosmetic) { curvynessAdd= width / 2; curvynessMul= CURVE_FLATNESS; - roundness = qMax<int>(4, width * CURVE_FLATNESS); } else { curvynessAdd = width * m_inv_scale; curvynessMul = CURVE_FLATNESS / m_inv_scale; - roundness = qMax<int>(4, width * curvynessMul); } if (count < 2) |