diff options
author | Rainer Keller <rainer.keller@theqtcompany.com> | 2015-04-17 10:43:19 +0200 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-04-29 17:36:43 +0000 |
commit | 518f886b6128331ce47932edd637471d58d0d877 (patch) | |
tree | 5e23a4ee54e54cac30453644dadf21ce0d3826c8 /tests | |
parent | d0eba497c1c34d35ddda2b5d44902ebd636d4f9e (diff) |
Revert "Rotate images according to Exif orientation"
Due to a behavior change.
This reverts commit 9157087334186ff3ef811f2ec234a3bf5d4a4889.
This reverts commit 16c32c6dfbca03a46d1a2bb87b6c1c365e6179d5.
Task-number: QTBUG-37946
Task-number: QTBUG-45552
Task-number: QTBUG-43563
Change-Id: Idf8df7d8f22465e8f6b51acb68993ac97208b184
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_1.jpg | bin | 910 -> 0 bytes | |||
-rw-r--r-- | tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_2.jpg | bin | 910 -> 0 bytes | |||
-rw-r--r-- | tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_3.jpg | bin | 988 -> 0 bytes | |||
-rw-r--r-- | tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_4.jpg | bin | 995 -> 0 bytes | |||
-rw-r--r-- | tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_5.jpg | bin | 912 -> 0 bytes | |||
-rw-r--r-- | tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_6.jpg | bin | 911 -> 0 bytes | |||
-rw-r--r-- | tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_6_motorola.jpg | bin | 911 -> 0 bytes | |||
-rw-r--r-- | tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_7.jpg | bin | 987 -> 0 bytes | |||
-rw-r--r-- | tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_8.jpg | bin | 991 -> 0 bytes | |||
-rw-r--r-- | tests/auto/gui/image/qimage/tst_qimage.cpp | 33 |
10 files changed, 0 insertions, 33 deletions
diff --git a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_1.jpg b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_1.jpg Binary files differdeleted file mode 100644 index aaa4ac4e10..0000000000 --- a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_1.jpg +++ /dev/null diff --git a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_2.jpg b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_2.jpg Binary files differdeleted file mode 100644 index a61d2723d7..0000000000 --- a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_2.jpg +++ /dev/null diff --git a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_3.jpg b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_3.jpg Binary files differdeleted file mode 100644 index 43e56dcef7..0000000000 --- a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_3.jpg +++ /dev/null diff --git a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_4.jpg b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_4.jpg Binary files differdeleted file mode 100644 index d5d06f7409..0000000000 --- a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_4.jpg +++ /dev/null diff --git a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_5.jpg b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_5.jpg Binary files differdeleted file mode 100644 index 1886f3775e..0000000000 --- a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_5.jpg +++ /dev/null diff --git a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_6.jpg b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_6.jpg Binary files differdeleted file mode 100644 index 5cec757354..0000000000 --- a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_6.jpg +++ /dev/null diff --git a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_6_motorola.jpg b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_6_motorola.jpg Binary files differdeleted file mode 100644 index 0aa164b78b..0000000000 --- a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_6_motorola.jpg +++ /dev/null diff --git a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_7.jpg b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_7.jpg Binary files differdeleted file mode 100644 index b3dcc466a9..0000000000 --- a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_7.jpg +++ /dev/null diff --git a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_8.jpg b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_8.jpg Binary files differdeleted file mode 100644 index 8bc390e2b9..0000000000 --- a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_8.jpg +++ /dev/null diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp index 309d3a80c5..33302edfeb 100644 --- a/tests/auto/gui/image/qimage/tst_qimage.cpp +++ b/tests/auto/gui/image/qimage/tst_qimage.cpp @@ -173,9 +173,6 @@ private slots: void invertPixelsRGB_data(); void invertPixelsRGB(); - void exifOrientation_data(); - void exifOrientation(); - void cleanupFunctions(); private: @@ -2649,36 +2646,6 @@ void tst_QImage::invertPixelsRGB() QCOMPARE(qBlue(pixel) >> 4, (255 - 96) >> 4); } -void tst_QImage::exifOrientation_data() -{ - QTest::addColumn<QString>("fileName"); - QTest::newRow("Orientation 1, Intel format") << m_prefix + "jpeg_exif_orientation_value_1.jpg"; - QTest::newRow("Orientation 2, Intel format") << m_prefix + "jpeg_exif_orientation_value_2.jpg"; - QTest::newRow("Orientation 3, Intel format") << m_prefix + "jpeg_exif_orientation_value_3.jpg"; - QTest::newRow("Orientation 4, Intel format") << m_prefix + "jpeg_exif_orientation_value_4.jpg"; - QTest::newRow("Orientation 5, Intel format") << m_prefix + "jpeg_exif_orientation_value_5.jpg"; - QTest::newRow("Orientation 6, Intel format") << m_prefix + "jpeg_exif_orientation_value_6.jpg"; - QTest::newRow("Orientation 6, Motorola format") << m_prefix + "jpeg_exif_orientation_value_6_motorola.jpg"; - QTest::newRow("Orientation 7, Intel format") << m_prefix + "jpeg_exif_orientation_value_7.jpg"; - QTest::newRow("Orientation 8, Intel format") << m_prefix + "jpeg_exif_orientation_value_8.jpg"; -} - -void tst_QImage::exifOrientation() -{ - QFETCH(QString, fileName); - - QImage img; - QRgb px; - - QVERIFY(img.load(fileName)); - - px = img.pixel(0, 0); - QVERIFY(qRed(px) > 250 && qGreen(px) < 5 && qBlue(px) < 5); - - px = img.pixel(img.width() - 1, 0); - QVERIFY(qRed(px) < 5 && qGreen(px) < 5 && qBlue(px) > 250); -} - static void cleanupFunction(void* info) { bool *called = static_cast<bool*>(info); |