From 518f886b6128331ce47932edd637471d58d0d877 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Fri, 17 Apr 2015 10:43:19 +0200 Subject: 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 Reviewed-by: Gunnar Sletta --- .../image/qimage/images/jpeg_exif_orientation_value_1.jpg | Bin 910 -> 0 bytes .../image/qimage/images/jpeg_exif_orientation_value_2.jpg | Bin 910 -> 0 bytes .../image/qimage/images/jpeg_exif_orientation_value_3.jpg | Bin 988 -> 0 bytes .../image/qimage/images/jpeg_exif_orientation_value_4.jpg | Bin 995 -> 0 bytes .../image/qimage/images/jpeg_exif_orientation_value_5.jpg | Bin 912 -> 0 bytes .../image/qimage/images/jpeg_exif_orientation_value_6.jpg | Bin 911 -> 0 bytes .../images/jpeg_exif_orientation_value_6_motorola.jpg | Bin 911 -> 0 bytes .../image/qimage/images/jpeg_exif_orientation_value_7.jpg | Bin 987 -> 0 bytes .../image/qimage/images/jpeg_exif_orientation_value_8.jpg | Bin 991 -> 0 bytes 9 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_1.jpg delete mode 100644 tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_2.jpg delete mode 100644 tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_3.jpg delete mode 100644 tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_4.jpg delete mode 100644 tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_5.jpg delete mode 100644 tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_6.jpg delete mode 100644 tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_6_motorola.jpg delete mode 100644 tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_7.jpg delete mode 100644 tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_8.jpg (limited to 'tests/auto/gui/image/qimage/images') 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 deleted file mode 100644 index aaa4ac4e10..0000000000 Binary files a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_1.jpg and /dev/null differ 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 deleted file mode 100644 index a61d2723d7..0000000000 Binary files a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_2.jpg and /dev/null differ 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 deleted file mode 100644 index 43e56dcef7..0000000000 Binary files a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_3.jpg and /dev/null differ 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 deleted file mode 100644 index d5d06f7409..0000000000 Binary files a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_4.jpg and /dev/null differ 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 deleted file mode 100644 index 1886f3775e..0000000000 Binary files a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_5.jpg and /dev/null differ 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 deleted file mode 100644 index 5cec757354..0000000000 Binary files a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_6.jpg and /dev/null differ 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 deleted file mode 100644 index 0aa164b78b..0000000000 Binary files a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_6_motorola.jpg and /dev/null differ 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 deleted file mode 100644 index b3dcc466a9..0000000000 Binary files a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_7.jpg and /dev/null differ 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 deleted file mode 100644 index 8bc390e2b9..0000000000 Binary files a/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_8.jpg and /dev/null differ -- cgit v1.2.3 From ba323b04cd78fb43e9e63b891e973d24b08250af Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 4 May 2015 13:32:32 +0200 Subject: Optionally apply orientation on QImage read Make it possible to read images with EXIF orientation automatically applied. This was originally implemented without opt-out in Qt 5.4, but reverted. Here it is implemented as opt-in for JPEG, and opt-out for TIFF to keep behavioral consistency. The EXIF support for JPEG was written by Rainer Keller. [ChangeLog][QtGui][Image plugins] An option has been added to QImageReader to enable automatic application of EXIF orientation. This behavior was default in Qt 5.4.1, but reverted in Qt 5.4.2. Task-number: QTBUG-37946 Task-number: QTBUG-43563 Task-number: QTBUG-45552 Task-number: QTBUG-45865 Change-Id: Iaafd2519b63ede66ecc1f8aa4c7118081312b8f5 Reviewed-by: Gunnar Sletta --- .../gui/image/qimage/images/jpeg_exif_QTBUG-45865.jpg | Bin 0 -> 27540 bytes .../qimage/images/jpeg_exif_orientation_value_1.jpg | Bin 0 -> 910 bytes .../qimage/images/jpeg_exif_orientation_value_2.jpg | Bin 0 -> 910 bytes .../qimage/images/jpeg_exif_orientation_value_3.jpg | Bin 0 -> 988 bytes .../qimage/images/jpeg_exif_orientation_value_4.jpg | Bin 0 -> 995 bytes .../qimage/images/jpeg_exif_orientation_value_5.jpg | Bin 0 -> 912 bytes .../qimage/images/jpeg_exif_orientation_value_6.jpg | Bin 0 -> 911 bytes .../images/jpeg_exif_orientation_value_6_motorola.jpg | Bin 0 -> 911 bytes .../qimage/images/jpeg_exif_orientation_value_7.jpg | Bin 0 -> 987 bytes .../qimage/images/jpeg_exif_orientation_value_8.jpg | Bin 0 -> 991 bytes 10 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 tests/auto/gui/image/qimage/images/jpeg_exif_QTBUG-45865.jpg create mode 100644 tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_1.jpg create mode 100644 tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_2.jpg create mode 100644 tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_3.jpg create mode 100644 tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_4.jpg create mode 100644 tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_5.jpg create mode 100644 tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_6.jpg create mode 100644 tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_6_motorola.jpg create mode 100644 tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_7.jpg create mode 100644 tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_8.jpg (limited to 'tests/auto/gui/image/qimage/images') diff --git a/tests/auto/gui/image/qimage/images/jpeg_exif_QTBUG-45865.jpg b/tests/auto/gui/image/qimage/images/jpeg_exif_QTBUG-45865.jpg new file mode 100644 index 0000000000..97deae3e25 Binary files /dev/null and b/tests/auto/gui/image/qimage/images/jpeg_exif_QTBUG-45865.jpg differ 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 new file mode 100644 index 0000000000..aaa4ac4e10 Binary files /dev/null and b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_1.jpg differ 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 new file mode 100644 index 0000000000..a61d2723d7 Binary files /dev/null and b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_2.jpg differ 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 new file mode 100644 index 0000000000..43e56dcef7 Binary files /dev/null and b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_3.jpg differ 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 new file mode 100644 index 0000000000..d5d06f7409 Binary files /dev/null and b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_4.jpg differ 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 new file mode 100644 index 0000000000..1886f3775e Binary files /dev/null and b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_5.jpg differ 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 new file mode 100644 index 0000000000..5cec757354 Binary files /dev/null and b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_6.jpg differ 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 new file mode 100644 index 0000000000..0aa164b78b Binary files /dev/null and b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_6_motorola.jpg differ 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 new file mode 100644 index 0000000000..b3dcc466a9 Binary files /dev/null and b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_7.jpg differ 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 new file mode 100644 index 0000000000..8bc390e2b9 Binary files /dev/null and b/tests/auto/gui/image/qimage/images/jpeg_exif_orientation_value_8.jpg differ -- cgit v1.2.3