diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-03-02 11:16:31 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-03-02 11:16:31 (GMT) |
| commit | 671a6a0dc82857dd84feddf49d38540dd59186df (patch) | |
| tree | 87200bec50e81404cbde43372cfeed07d843fd90 /src/multimedia | |
| parent | d0c4433ca1aabab1a8fac1aae2ba65f25dae5f85 (diff) | |
| download | Qt-671a6a0dc82857dd84feddf49d38540dd59186df.zip Qt-671a6a0dc82857dd84feddf49d38540dd59186df.tar.gz Qt-671a6a0dc82857dd84feddf49d38540dd59186df.tar.bz2 | |
OS X 10.4 compile error; required casting int to GLint.
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/base/qpaintervideosurface.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/multimedia/base/qpaintervideosurface.cpp b/src/multimedia/base/qpaintervideosurface.cpp index 97fddc9..fc3d493 100644 --- a/src/multimedia/base/qpaintervideosurface.cpp +++ b/src/multimedia/base/qpaintervideosurface.cpp @@ -1158,14 +1158,14 @@ QAbstractVideoSurface::Error QVideoSurfaceGlslPainter::paint( glBindTexture(GL_TEXTURE_2D, m_textureIds[2]); glActiveTexture(GL_TEXTURE0); - m_program.setUniformValue("texY", 0); - m_program.setUniformValue("texU", 1); - m_program.setUniformValue("texV", 2); + m_program.setUniformValue("texY", GLint(0)); + m_program.setUniformValue("texU", GLint(1)); + m_program.setUniformValue("texV", GLint(2)); } else { glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, m_textureIds[0]); - m_program.setUniformValue("texRgb", 0); + m_program.setUniformValue("texRgb", GLint(0)); } m_program.setUniformValue("colorMatrix", m_colorMatrix); |