Ensure RGB32 images are not converted on upload to atlas.

Fixes "Typo No.12" reported at http://www.viva64.com/en/b/0251/

Change-Id: Ifa4d57df68b9515c76a8fb94f87d0a70ba3b5faf
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>

diff --git a/src/quick/scenegraph/util/qsgatlastexture.cpp b/src/quick/scenegraph/util/qsgatlastexture.cpp
index b0787e9..17f5460 100644 (file)
--- a/src/quick/scenegraph/util/qsgatlastexture.cpp
+++ b/src/quick/scenegraph/util/qsgatlastexture.cpp
@@ -275,7 +275,7 @@ void Atlas::uploadBgra(Texture *texture)
     QImage image = texture->image();
 
     if (image.format() != QImage::Format_ARGB32_Premultiplied
-            || image.format() != QImage::Format_RGB32) {
+            && image.format() != QImage::Format_RGB32) {
         image = image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
     }