diff options
| author | Michael Brasser <michael.brasser@live.com> | 2014-04-22 21:10:58 -0500 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-28 22:24:58 +0200 |
| commit | 466589e5908b44ccf47afa1260527e10a1fa077c (patch) | |
| tree | f45d5b978cc410a6d5754553365f79d0a9f98210 /src/quick/scenegraph/util/qsgatlastexture.cpp | |
| parent | 03e4fb974a0d9196cd030276ba3534c22a35d446 (diff) | |
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>
Diffstat (limited to 'src/quick/scenegraph/util/qsgatlastexture.cpp')
| -rw-r--r-- | src/quick/scenegraph/util/qsgatlastexture.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/util/qsgatlastexture.cpp b/src/quick/scenegraph/util/qsgatlastexture.cpp index b0787e9a2e..17f5460d9a 100644 --- 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); } |