diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-03 10:58:45 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-03 10:58:45 +0200 |
| commit | 6727ae3172aa7c3a791efd839ebefe24a4b8134c (patch) | |
| tree | 63ecf158da5ba45bc5501e7bcaf7f57df2ed56f8 /src/plugins/imageformats/dds/qddshandler.cpp | |
| parent | 405bfa87e6f1c5b7fe89efa4b566f99d01375567 (diff) | |
| parent | 454fb13c465e29f0d0f9a295bdb822b4a09c7e48 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: Id8a59a58c7e5ca2f977c1e7408ff05033a9cc16b
Diffstat (limited to 'src/plugins/imageformats/dds/qddshandler.cpp')
| -rw-r--r-- | src/plugins/imageformats/dds/qddshandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/imageformats/dds/qddshandler.cpp b/src/plugins/imageformats/dds/qddshandler.cpp index 363ce22..f7829aa 100644 --- a/src/plugins/imageformats/dds/qddshandler.cpp +++ b/src/plugins/imageformats/dds/qddshandler.cpp @@ -103,7 +103,7 @@ struct FormatInfo static const FormatInfo formatInfos[] = { { FormatA8R8G8B8, DDSPixelFormat::FlagRGBA, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 }, { FormatX8R8G8B8, DDSPixelFormat::FlagRGB, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0x00000000 }, - { FormatA2B10G10R10, DDSPixelFormat::FlagRGBA, 32, 0x000003ff, 0x0000fc00, 0x3ff00000, 0xc0000000 }, + { FormatA2B10G10R10, DDSPixelFormat::FlagRGBA, 32, 0x000003ff, 0x000ffc00, 0x3ff00000, 0xc0000000 }, { FormatA8B8G8R8, DDSPixelFormat::FlagRGBA, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000 }, { FormatX8B8G8R8, DDSPixelFormat::FlagRGB, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0x00000000 }, { FormatG16R16, DDSPixelFormat::FlagRGBA, 32, 0x0000ffff, 0xffff0000, 0x00000000, 0x00000000 }, @@ -325,7 +325,7 @@ static Format getFormat(const DDSHeader &dds) if ((format.flags & info.flags) == info.flags && format.rgbBitCount == info.bitCount && format.rBitMask == info.rBitMask && - format.bBitMask == info.bBitMask && + format.gBitMask == info.gBitMask && format.bBitMask == info.bBitMask && format.aBitMask == info.aBitMask) { return info.format; |