Add Direct Draw Surface plugin

Change-Id: I8dfa6001c1aae2dcb5f2e6e0bfd142ef1f9dddbc
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

52 files changed, 215 insertions, 1 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 5bde0c7..6ac74e2 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,5 +1,6 @@
 TEMPLATE = subdirs
 SUBDIRS = \
     tga \
-    wbmp
+    wbmp \
+    dds
 contains(QT_CONFIG, system-zlib): SUBDIRS += mng tiff
diff --git a/tests/auto/dds/dds.pro b/tests/auto/dds/dds.pro
new file mode 100644
index 0000000..da63b84
--- /dev/null
+++ b/tests/auto/dds/dds.pro
@@ -0,0 +1,8 @@
+TARGET = tst_qdds
+
+QT = core gui testlib
+CONFIG -= app_bundle
+CONFIG += testcase
+
+SOURCES += tst_qdds.cpp
+RESOURCES += $$PWD/../../shared/images/dds.qrc
diff --git a/tests/auto/dds/tst_qdds.cpp b/tests/auto/dds/tst_qdds.cpp
new file mode 100644
index 0000000..de05ec4
--- /dev/null
+++ b/tests/auto/dds/tst_qdds.cpp
@@ -0,0 +1,153 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Ivan Komissarov.
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the DDS plugin in the Qt ImageFormats module.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <QtGui/QtGui>
+
+class tst_qdds: public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void readImage_data();
+    void readImage();
+    void testMipmaps_data();
+    void testMipmaps();
+};
+
+void tst_qdds::readImage_data()
+{
+    QTest::addColumn<QString>("fileName");
+    QTest::addColumn<QSize>("size");
+
+    QTest::newRow("1") << QString("A1R5G5B5") << QSize(64, 64);
+    QTest::newRow("2") << QString("A2B10G10R10") << QSize(64, 64);
+    QTest::newRow("3") << QString("A2R10G10B10") << QSize(64, 64);
+    QTest::newRow("4") << QString("A2W10V10U10") << QSize(64, 64);
+    QTest::newRow("5") << QString("A4L4") << QSize(64, 64);
+    QTest::newRow("6") << QString("A4R4G4B4") << QSize(64, 64);
+    QTest::newRow("7") << QString("A8") << QSize(64, 64);
+    QTest::newRow("8") << QString("A8B8G8R8") << QSize(64, 64);
+    QTest::newRow("9") << QString("A8L8") << QSize(64, 64);
+    QTest::newRow("10") << QString("A8R3G3B2") << QSize(64, 64);
+    QTest::newRow("11") << QString("A8R8G8B8") << QSize(64, 64);
+    QTest::newRow("12") << QString("A16B16G16R16") << QSize(64, 64);
+    QTest::newRow("13") << QString("A16B16G16R16F") << QSize(64, 64);
+    QTest::newRow("14") << QString("A32B32G32R32F") << QSize(64, 64);
+    QTest::newRow("15") << QString("CxV8U8") << QSize(64, 64);
+    QTest::newRow("16") << QString("DXT1") << QSize(50, 50);
+    QTest::newRow("17") << QString("DXT2") << QSize(64, 64);
+    QTest::newRow("18") << QString("DXT3") << QSize(64, 64);
+    QTest::newRow("19") << QString("DXT4") << QSize(64, 64);
+    QTest::newRow("20") << QString("DXT5") << QSize(64, 64);
+    QTest::newRow("21") << QString("G8R8_G8B8") << QSize(64, 64);
+    QTest::newRow("22") << QString("G16R16") << QSize(64, 64);
+    QTest::newRow("23") << QString("G16R16F") << QSize(64, 64);
+    QTest::newRow("24") << QString("G32R32F") << QSize(64, 64);
+    QTest::newRow("25") << QString("L6V5U5") << QSize(64, 64);
+    QTest::newRow("26") << QString("L8") << QSize(64, 64);
+    QTest::newRow("27") << QString("L16") << QSize(64, 64);
+    QTest::newRow("28") << QString("P8") << QSize(64, 64);
+    QTest::newRow("29") << QString("Q8W8V8U8") << QSize(64, 64);
+    QTest::newRow("30") << QString("Q16W16V16U16") << QSize(64, 64);
+    QTest::newRow("31") << QString("R3G3B2") << QSize(64, 64);
+    QTest::newRow("32") << QString("R5G6B5") << QSize(64, 64);
+    QTest::newRow("33") << QString("R8G8_B8G8") << QSize(64, 64);
+    QTest::newRow("34") << QString("R8G8B8") << QSize(64, 64);
+    QTest::newRow("35") << QString("R16F") << QSize(64, 64);
+    QTest::newRow("36") << QString("R32F") << QSize(64, 64);
+    QTest::newRow("37") << QString("UYVY") << QSize(64, 64);
+    QTest::newRow("38") << QString("V8U8") << QSize(64, 64);
+    QTest::newRow("39") << QString("V16U16") << QSize(64, 64);
+    QTest::newRow("40") << QString("X1R5G5B5") << QSize(64, 64);
+    QTest::newRow("41") << QString("X4R4G4B4") << QSize(64, 64);
+    QTest::newRow("42") << QString("X8B8G8R8") << QSize(64, 64);
+    QTest::newRow("43") << QString("X8L8V8U8") << QSize(64, 64);
+    QTest::newRow("44") << QString("X8R8G8B8") << QSize(64, 64);
+    QTest::newRow("45") << QString("YUY2") << QSize(64, 64);
+    QTest::newRow("46") << QString("RXGB") << QSize(64, 64);
+    QTest::newRow("47") << QString("ATI2") << QSize(64, 64);
+}
+
+void tst_qdds::readImage()
+{
+    QFETCH(QString, fileName);
+    QFETCH(QSize, size);
+
+    const QString path = QStringLiteral(":/dds/") + fileName + QStringLiteral(".dds");
+    QImageReader reader(path);
+    QVERIFY(reader.canRead());
+    QImage image = reader.read();
+    QVERIFY2(!image.isNull(), qPrintable(reader.errorString()));
+    QCOMPARE(image.size(), size);
+}
+
+void tst_qdds::testMipmaps_data()
+{
+    QTest::addColumn<QString>("fileName");
+    QTest::addColumn<QSize>("size");
+    QTest::addColumn<int>("imageCount");
+
+    QTest::newRow("1") << QString("mipmaps") << QSize(64, 64) << 7;
+}
+
+void tst_qdds::testMipmaps()
+{
+    QFETCH(QString, fileName);
+    QFETCH(QSize, size);
+    QFETCH(int, imageCount);
+
+    const QString path = QStringLiteral(":/dds/") + fileName + QStringLiteral(".dds");
+    QImageReader reader(path);
+    QVERIFY(reader.canRead());
+    QCOMPARE(reader.imageCount(), imageCount);
+
+    for (int i = 0; i < reader.imageCount(); ++i) {
+        reader.jumpToImage(i);
+        QImage image = reader.read();
+        QVERIFY2(!image.isNull(), qPrintable(reader.errorString()));
+        QCOMPARE(image.size(), size / (1 << i));
+    }
+}
+
+QTEST_MAIN(tst_qdds)
+#include "tst_qdds.moc"
diff --git a/tests/shared/images/dds.qrc b/tests/shared/images/dds.qrc
new file mode 100644
index 0000000..e19eee9
--- /dev/null
+++ b/tests/shared/images/dds.qrc
@@ -0,0 +1,52 @@
+<RCC>
+    <qresource prefix="/">
+        <file>dds/A1R5G5B5.dds</file>
+        <file>dds/A2B10G10R10.dds</file>
+        <file>dds/A2R10G10B10.dds</file>
+        <file>dds/A2W10V10U10.dds</file>
+        <file>dds/A4L4.dds</file>
+        <file>dds/A4R4G4B4.dds</file>
+        <file>dds/A8.dds</file>
+        <file>dds/A8B8G8R8.dds</file>
+        <file>dds/A8L8.dds</file>
+        <file>dds/A8R3G3B2.dds</file>
+        <file>dds/A8R8G8B8.dds</file>
+        <file>dds/A16B16G16R16.dds</file>
+        <file>dds/A16B16G16R16F.dds</file>
+        <file>dds/A32B32G32R32F.dds</file>
+        <file>dds/CxV8U8.dds</file>
+        <file>dds/DXT1.dds</file>
+        <file>dds/DXT2.dds</file>
+        <file>dds/DXT3.dds</file>
+        <file>dds/DXT4.dds</file>
+        <file>dds/DXT5.dds</file>
+        <file>dds/G8R8_G8B8.dds</file>
+        <file>dds/G16R16.dds</file>
+        <file>dds/G16R16F.dds</file>
+        <file>dds/G32R32F.dds</file>
+        <file>dds/L6V5U5.dds</file>
+        <file>dds/L8.dds</file>
+        <file>dds/L16.dds</file>
+        <file>dds/mipmaps.dds</file>
+        <file>dds/P8.dds</file>
+        <file>dds/Q8W8V8U8.dds</file>
+        <file>dds/Q16W16V16U16.dds</file>
+        <file>dds/R3G3B2.dds</file>
+        <file>dds/R5G6B5.dds</file>
+        <file>dds/R8G8_B8G8.dds</file>
+        <file>dds/R8G8B8.dds</file>
+        <file>dds/R16F.dds</file>
+        <file>dds/R32F.dds</file>
+        <file>dds/UYVY.dds</file>
+        <file>dds/V8U8.dds</file>
+        <file>dds/V16U16.dds</file>
+        <file>dds/X1R5G5B5.dds</file>
+        <file>dds/X4R4G4B4.dds</file>
+        <file>dds/X8B8G8R8.dds</file>
+        <file>dds/X8L8V8U8.dds</file>
+        <file>dds/X8R8G8B8.dds</file>
+        <file>dds/YUY2.dds</file>
+        <file>dds/RXGB.dds</file>
+        <file>dds/ATI2.dds</file>
+    </qresource>
+</RCC>
diff --git a/tests/shared/images/dds/A16B16G16R16.dds b/tests/shared/images/dds/A16B16G16R16.dds
new file mode 100644
index 0000000..9b59982
--- /dev/null
+++ b/tests/shared/images/dds/A16B16G16R16.dds
diff --git a/tests/shared/images/dds/A16B16G16R16F.dds b/tests/shared/images/dds/A16B16G16R16F.dds
new file mode 100644
index 0000000..5e59107
--- /dev/null
+++ b/tests/shared/images/dds/A16B16G16R16F.dds
diff --git a/tests/shared/images/dds/A1R5G5B5.dds b/tests/shared/images/dds/A1R5G5B5.dds
new file mode 100644
index 0000000..38c7123
--- /dev/null
+++ b/tests/shared/images/dds/A1R5G5B5.dds
diff --git a/tests/shared/images/dds/A2B10G10R10.dds b/tests/shared/images/dds/A2B10G10R10.dds
new file mode 100644
index 0000000..37bc09b
--- /dev/null
+++ b/tests/shared/images/dds/A2B10G10R10.dds
diff --git a/tests/shared/images/dds/A2R10G10B10.dds b/tests/shared/images/dds/A2R10G10B10.dds
new file mode 100644
index 0000000..0754794
--- /dev/null
+++ b/tests/shared/images/dds/A2R10G10B10.dds
diff --git a/tests/shared/images/dds/A2W10V10U10.dds b/tests/shared/images/dds/A2W10V10U10.dds
new file mode 100644
index 0000000..d7eca43
--- /dev/null
+++ b/tests/shared/images/dds/A2W10V10U10.dds
diff --git a/tests/shared/images/dds/A32B32G32R32F.dds b/tests/shared/images/dds/A32B32G32R32F.dds
new file mode 100644
index 0000000..c9a1372
--- /dev/null
+++ b/tests/shared/images/dds/A32B32G32R32F.dds
diff --git a/tests/shared/images/dds/A4L4.dds b/tests/shared/images/dds/A4L4.dds
new file mode 100644
index 0000000..e1872f3
--- /dev/null
+++ b/tests/shared/images/dds/A4L4.dds
diff --git a/tests/shared/images/dds/A4R4G4B4.dds b/tests/shared/images/dds/A4R4G4B4.dds
new file mode 100644
index 0000000..e477e46
--- /dev/null
+++ b/tests/shared/images/dds/A4R4G4B4.dds
diff --git a/tests/shared/images/dds/A8.dds b/tests/shared/images/dds/A8.dds
new file mode 100644
index 0000000..90b773b
--- /dev/null
+++ b/tests/shared/images/dds/A8.dds
diff --git a/tests/shared/images/dds/A8B8G8R8.dds b/tests/shared/images/dds/A8B8G8R8.dds
new file mode 100644
index 0000000..a9bab75
--- /dev/null
+++ b/tests/shared/images/dds/A8B8G8R8.dds
diff --git a/tests/shared/images/dds/A8L8.dds b/tests/shared/images/dds/A8L8.dds
new file mode 100644
index 0000000..8a26262
--- /dev/null
+++ b/tests/shared/images/dds/A8L8.dds
diff --git a/tests/shared/images/dds/A8R3G3B2.dds b/tests/shared/images/dds/A8R3G3B2.dds
new file mode 100644
index 0000000..c69b3a3
--- /dev/null
+++ b/tests/shared/images/dds/A8R3G3B2.dds
diff --git a/tests/shared/images/dds/A8R8G8B8.dds b/tests/shared/images/dds/A8R8G8B8.dds
new file mode 100644
index 0000000..1a44039
--- /dev/null
+++ b/tests/shared/images/dds/A8R8G8B8.dds
diff --git a/tests/shared/images/dds/ATI2.dds b/tests/shared/images/dds/ATI2.dds
new file mode 100644
index 0000000..8f85817
--- /dev/null
+++ b/tests/shared/images/dds/ATI2.dds
diff --git a/tests/shared/images/dds/CxV8U8.dds b/tests/shared/images/dds/CxV8U8.dds
new file mode 100644
index 0000000..2b6f69d
--- /dev/null
+++ b/tests/shared/images/dds/CxV8U8.dds
diff --git a/tests/shared/images/dds/DXT1.dds b/tests/shared/images/dds/DXT1.dds
new file mode 100644
index 0000000..2ba685c
--- /dev/null
+++ b/tests/shared/images/dds/DXT1.dds
diff --git a/tests/shared/images/dds/DXT2.dds b/tests/shared/images/dds/DXT2.dds
new file mode 100644
index 0000000..f4f006c
--- /dev/null
+++ b/tests/shared/images/dds/DXT2.dds
diff --git a/tests/shared/images/dds/DXT3.dds b/tests/shared/images/dds/DXT3.dds
new file mode 100644
index 0000000..0498c40
--- /dev/null
+++ b/tests/shared/images/dds/DXT3.dds
diff --git a/tests/shared/images/dds/DXT4.dds b/tests/shared/images/dds/DXT4.dds
new file mode 100644
index 0000000..ecc6057
--- /dev/null
+++ b/tests/shared/images/dds/DXT4.dds
diff --git a/tests/shared/images/dds/DXT5.dds b/tests/shared/images/dds/DXT5.dds
new file mode 100644
index 0000000..47a431c
--- /dev/null
+++ b/tests/shared/images/dds/DXT5.dds
diff --git a/tests/shared/images/dds/G16R16.dds b/tests/shared/images/dds/G16R16.dds
new file mode 100644
index 0000000..1d940ae
--- /dev/null
+++ b/tests/shared/images/dds/G16R16.dds
diff --git a/tests/shared/images/dds/G16R16F.dds b/tests/shared/images/dds/G16R16F.dds
new file mode 100644
index 0000000..e68d970
--- /dev/null
+++ b/tests/shared/images/dds/G16R16F.dds
diff --git a/tests/shared/images/dds/G32R32F.dds b/tests/shared/images/dds/G32R32F.dds
new file mode 100644
index 0000000..f3cf9d1
--- /dev/null
+++ b/tests/shared/images/dds/G32R32F.dds
diff --git a/tests/shared/images/dds/G8R8_G8B8.dds b/tests/shared/images/dds/G8R8_G8B8.dds
new file mode 100644
index 0000000..eaa0210
--- /dev/null
+++ b/tests/shared/images/dds/G8R8_G8B8.dds
diff --git a/tests/shared/images/dds/L16.dds b/tests/shared/images/dds/L16.dds
new file mode 100644
index 0000000..42710c5
--- /dev/null
+++ b/tests/shared/images/dds/L16.dds
diff --git a/tests/shared/images/dds/L6V5U5.dds b/tests/shared/images/dds/L6V5U5.dds
new file mode 100644
index 0000000..cf77f71
--- /dev/null
+++ b/tests/shared/images/dds/L6V5U5.dds
diff --git a/tests/shared/images/dds/L8.dds b/tests/shared/images/dds/L8.dds
new file mode 100644
index 0000000..4eba673
--- /dev/null
+++ b/tests/shared/images/dds/L8.dds
diff --git a/tests/shared/images/dds/P8.dds b/tests/shared/images/dds/P8.dds
new file mode 100644
index 0000000..936b870
--- /dev/null
+++ b/tests/shared/images/dds/P8.dds
diff --git a/tests/shared/images/dds/Q16W16V16U16.dds b/tests/shared/images/dds/Q16W16V16U16.dds
new file mode 100644
index 0000000..3b464e5
--- /dev/null
+++ b/tests/shared/images/dds/Q16W16V16U16.dds
diff --git a/tests/shared/images/dds/Q8W8V8U8.dds b/tests/shared/images/dds/Q8W8V8U8.dds
new file mode 100644
index 0000000..b5c6864
--- /dev/null
+++ b/tests/shared/images/dds/Q8W8V8U8.dds
diff --git a/tests/shared/images/dds/R16F.dds b/tests/shared/images/dds/R16F.dds
new file mode 100644
index 0000000..e19863b
--- /dev/null
+++ b/tests/shared/images/dds/R16F.dds
diff --git a/tests/shared/images/dds/R32F.dds b/tests/shared/images/dds/R32F.dds
new file mode 100644
index 0000000..b13dd77
--- /dev/null
+++ b/tests/shared/images/dds/R32F.dds
diff --git a/tests/shared/images/dds/R3G3B2.dds b/tests/shared/images/dds/R3G3B2.dds
new file mode 100644
index 0000000..866dea6
--- /dev/null
+++ b/tests/shared/images/dds/R3G3B2.dds
diff --git a/tests/shared/images/dds/R5G6B5.dds b/tests/shared/images/dds/R5G6B5.dds
new file mode 100644
index 0000000..96a77ef
--- /dev/null
+++ b/tests/shared/images/dds/R5G6B5.dds
diff --git a/tests/shared/images/dds/R8G8B8.dds b/tests/shared/images/dds/R8G8B8.dds
new file mode 100644
index 0000000..7239bfd
--- /dev/null
+++ b/tests/shared/images/dds/R8G8B8.dds
diff --git a/tests/shared/images/dds/R8G8_B8G8.dds b/tests/shared/images/dds/R8G8_B8G8.dds
new file mode 100644
index 0000000..38cdb84
--- /dev/null
+++ b/tests/shared/images/dds/R8G8_B8G8.dds
diff --git a/tests/shared/images/dds/RXGB.dds b/tests/shared/images/dds/RXGB.dds
new file mode 100644
index 0000000..c92d281
--- /dev/null
+++ b/tests/shared/images/dds/RXGB.dds
diff --git a/tests/shared/images/dds/UYVY.dds b/tests/shared/images/dds/UYVY.dds
new file mode 100644
index 0000000..6f54acd
--- /dev/null
+++ b/tests/shared/images/dds/UYVY.dds
diff --git a/tests/shared/images/dds/V16U16.dds b/tests/shared/images/dds/V16U16.dds
new file mode 100644
index 0000000..8e1f98e
--- /dev/null
+++ b/tests/shared/images/dds/V16U16.dds
diff --git a/tests/shared/images/dds/V8U8.dds b/tests/shared/images/dds/V8U8.dds
new file mode 100644
index 0000000..e149e29
--- /dev/null
+++ b/tests/shared/images/dds/V8U8.dds
diff --git a/tests/shared/images/dds/X1R5G5B5.dds b/tests/shared/images/dds/X1R5G5B5.dds
new file mode 100644
index 0000000..db7900d
--- /dev/null
+++ b/tests/shared/images/dds/X1R5G5B5.dds
diff --git a/tests/shared/images/dds/X4R4G4B4.dds b/tests/shared/images/dds/X4R4G4B4.dds
new file mode 100644
index 0000000..991f9e0
--- /dev/null
+++ b/tests/shared/images/dds/X4R4G4B4.dds
diff --git a/tests/shared/images/dds/X8B8G8R8.dds b/tests/shared/images/dds/X8B8G8R8.dds
new file mode 100644
index 0000000..a4edfb0
--- /dev/null
+++ b/tests/shared/images/dds/X8B8G8R8.dds
diff --git a/tests/shared/images/dds/X8L8V8U8.dds b/tests/shared/images/dds/X8L8V8U8.dds
new file mode 100644
index 0000000..00de9f1
--- /dev/null
+++ b/tests/shared/images/dds/X8L8V8U8.dds
diff --git a/tests/shared/images/dds/X8R8G8B8.dds b/tests/shared/images/dds/X8R8G8B8.dds
new file mode 100644
index 0000000..af84369
--- /dev/null
+++ b/tests/shared/images/dds/X8R8G8B8.dds
diff --git a/tests/shared/images/dds/YUY2.dds b/tests/shared/images/dds/YUY2.dds
new file mode 100644
index 0000000..09fb9c5
--- /dev/null
+++ b/tests/shared/images/dds/YUY2.dds
diff --git a/tests/shared/images/dds/mipmaps.dds b/tests/shared/images/dds/mipmaps.dds
new file mode 100644
index 0000000..32bdae6
--- /dev/null
+++ b/tests/shared/images/dds/mipmaps.dds