summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Dominic K <mdk@codethink.co.uk>2010-10-18 14:50:07 (GMT)
committerSamuel Rødal <samuel.rodal@nokia.com>2010-10-18 14:50:07 (GMT)
commit3e3361eff0f8e4e71c2d93ed21cba07637241217 (patch)
treec8fb97539eab08c2aba0e9a9720c2c65010c7d1e
parent4030cfb5b6788f115054aa8753248e6f7aa7ab37 (diff)
downloadQt-3e3361eff0f8e4e71c2d93ed21cba07637241217.zip
Qt-3e3361eff0f8e4e71c2d93ed21cba07637241217.tar.gz
Qt-3e3361eff0f8e4e71c2d93ed21cba07637241217.tar.bz2
In meego graphics system remove a redundant check.
Merge-request: 864 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
-rw-r--r--src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp b/src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp
index f95df20..08c2656 100644
--- a/src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp
+++ b/src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp
@@ -187,7 +187,7 @@ Qt::HANDLE QMeeGoPixmapData::imageToEGLSharedImage(const QImage &image)
glGenTextures(1, &textureId);
glBindTexture(GL_TEXTURE_2D, textureId);
- if (image.hasAlphaChannel() && (image.hasAlphaChannel() && const_cast<QImage &>(image).data_ptr()->checkForAlphaPixels())) {
+ if (image.hasAlphaChannel() && const_cast<QImage &>(image).data_ptr()->checkForAlphaPixels()) {
QImage convertedImage = image.convertToFormat(QImage::Format_ARGB4444_Premultiplied, Qt::DiffuseAlphaDither | Qt::DiffuseDither | Qt::PreferDither);
qARGBA4ToRGBA4(&convertedImage);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, image.width(), image.height(), 0, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, convertedImage.bits());