diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-20 22:57:59 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-20 23:32:28 (GMT) |
| commit | 7c594907d521bb29ecca1b953a4ceea49ec32dd4 (patch) | |
| tree | 98d614193f484a9f62f3080de3b55b43888f6700 /src/opengl/qpaintengine_opengl.cpp | |
| parent | 69e873e2bfae3fc028c21d93112a75008c3bb58b (diff) | |
| download | Qt-7c594907d521bb29ecca1b953a4ceea49ec32dd4.zip Qt-7c594907d521bb29ecca1b953a4ceea49ec32dd4.tar.gz Qt-7c594907d521bb29ecca1b953a4ceea49ec32dd4.tar.bz2 | |
Compile Qt in C++0x mode.
This is not valid in C++0x:
char str[] = { 128, 0 };
Because 128 cannot be represented in a char. The same applies to
conversion from int to qreal: it's a narrowing conversion, with
possible data loss.
More info: http://www2.research.att.com/~bs/C++0xFAQ.html#narrowing
Reviewed-by: Trust Me
Diffstat (limited to 'src/opengl/qpaintengine_opengl.cpp')
| -rw-r--r-- | src/opengl/qpaintengine_opengl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp index c8307a0..306fd8b 100644 --- a/src/opengl/qpaintengine_opengl.cpp +++ b/src/opengl/qpaintengine_opengl.cpp @@ -3342,15 +3342,15 @@ void QGLEllipseMaskGenerator::drawMask(const QRect &rect) QTransform gl_to_qt(1, 0, 0, -1, 0, offscreen->drawableSize().height()); QTransform inv_matrix = gl_to_qt * matrix().inverted() * translate; - float m[3][4] = { { inv_matrix.m11(), inv_matrix.m12(), inv_matrix.m13() }, - { inv_matrix.m21(), inv_matrix.m22(), inv_matrix.m23() }, - { inv_matrix.m31(), inv_matrix.m32(), inv_matrix.m33() } }; + float m[3][4] = { { float(inv_matrix.m11()), float(inv_matrix.m12()), float(inv_matrix.m13()) }, + { float(inv_matrix.m21()), float(inv_matrix.m22()), float(inv_matrix.m23()) }, + { float(inv_matrix.m31()), float(inv_matrix.m32()), float(inv_matrix.m33()) } }; QPoint offs(screen_rect.left() - rect.left(), (offscreen->drawableSize().height() - screen_rect.top()) - (offscreen->offscreenSize().height() - rect.top())); // last component needs to be 1.0f to avoid Nvidia bug on linux - float ellipse_offset[4] = { offs.x(), offs.y(), 0.0f, 1.0f }; + float ellipse_offset[4] = { float(offs.x()), float(offs.y()), 0.0f, 1.0f }; GLfloat vertexArray[4 * 2]; qt_add_rect_to_array(rect, vertexArray); |