diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-01-12 15:29:00 -0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2013-07-02 19:45:55 +0200 |
| commit | 5672c10bbeff5a10f383017df0dfe29c360d1cb8 (patch) | |
| tree | 0274643f27b3c5344eb822c9cb2e5e78c4eccb64 | |
| parent | 388e38afb5375b9e55005169a7218ff45870ebd9 (diff) | |
Compile in C++11 mode: fix narrowing conversion in arrays
Change-Id: I245abe09f60cb24e435af53ad7b2d2142f91b55c
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
| -rw-r--r-- | examples/qwidget-compositor/textureblitter.cpp | 8 | ||||
| -rw-r--r-- | examples/qwindow-compositor/textureblitter.cpp | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/examples/qwidget-compositor/textureblitter.cpp b/examples/qwidget-compositor/textureblitter.cpp index 0d3035dcc..78ea85597 100644 --- a/examples/qwidget-compositor/textureblitter.cpp +++ b/examples/qwidget-compositor/textureblitter.cpp @@ -124,10 +124,10 @@ void TextureBlitter::drawTexture(int textureId, const QRectF &targetRect, const } const GLfloat vertexCoordinates[] = { - x1, y1, zValue, - x2, y1, zValue, - x2, y2, zValue, - x1, y2, zValue + GLfloat(x1), GLfloat(y1), zValue, + GLfloat(x2), GLfloat(y1), zValue, + GLfloat(x2), GLfloat(y2), zValue, + GLfloat(x1), GLfloat(y2), zValue }; //Set matrix to transfrom geometry values into gl coordinate space. diff --git a/examples/qwindow-compositor/textureblitter.cpp b/examples/qwindow-compositor/textureblitter.cpp index ae634347a..4779b5150 100644 --- a/examples/qwindow-compositor/textureblitter.cpp +++ b/examples/qwindow-compositor/textureblitter.cpp @@ -128,10 +128,10 @@ void TextureBlitter::drawTexture(int textureId, const QRectF &targetRect, const } const GLfloat vertexCoordinates[] = { - x1, y1, zValue, - x2, y1, zValue, - x2, y2, zValue, - x1, y2, zValue + GLfloat(x1), GLfloat(y1), zValue, + GLfloat(x2), GLfloat(y1), zValue, + GLfloat(x2), GLfloat(y2), zValue, + GLfloat(x1), GLfloat(y2), zValue }; //Set matrix to transfrom geometry values into gl coordinate space. |