From 4fce5d1795eaf6b9911e139b7ec50292d004e269 Mon Sep 17 00:00:00 2001 From: aavit Date: Wed, 25 Jan 2012 16:04:51 +0100 Subject: Moving tiff image format support and libtiff out of qtbase The tiff plugin and bundled libtiff is moving to the qtimageformats project on Gerrit. Task-number: QTBUG-23887 Change-Id: I4c848232fdccddd7e7f54215f9eaa78dc4c3a53d Reviewed-by: Kent Hansen Reviewed-by: Lars Knoll --- .../gui/image/qimageconversion/qimageconversion.pro | 1 - .../gui/image/qimagereader/images/corrupt-data.tif | Bin 8590 -> 0 bytes .../images/rgba_adobedeflate_littleendian.tif | Bin 4784 -> 0 bytes .../qimagereader/images/rgba_lzw_littleendian.tif | Bin 26690 -> 0 bytes .../images/rgba_nocompression_bigendian.tif | Bin 160384 -> 0 bytes .../images/rgba_nocompression_littleendian.tif | Bin 160388 -> 0 bytes .../qimagereader/images/rgba_packbits_littleendian.tif | Bin 161370 -> 0 bytes .../images/rgba_zipdeflate_littleendian.tif | Bin 14728 -> 0 bytes .../benchmarks/gui/image/qimagereader/qimagereader.pro | 1 - 9 files changed, 2 deletions(-) delete mode 100644 tests/benchmarks/gui/image/qimagereader/images/corrupt-data.tif delete mode 100644 tests/benchmarks/gui/image/qimagereader/images/rgba_adobedeflate_littleendian.tif delete mode 100644 tests/benchmarks/gui/image/qimagereader/images/rgba_lzw_littleendian.tif delete mode 100644 tests/benchmarks/gui/image/qimagereader/images/rgba_nocompression_bigendian.tif delete mode 100644 tests/benchmarks/gui/image/qimagereader/images/rgba_nocompression_littleendian.tif delete mode 100644 tests/benchmarks/gui/image/qimagereader/images/rgba_packbits_littleendian.tif delete mode 100644 tests/benchmarks/gui/image/qimagereader/images/rgba_zipdeflate_littleendian.tif (limited to 'tests/benchmarks') diff --git a/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro b/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro index e04026bb7f..904ffa13d0 100644 --- a/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro +++ b/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro @@ -5,4 +5,3 @@ SOURCES += tst_qimageconversion.cpp !contains(QT_CONFIG, no-gif):DEFINES += QTEST_HAVE_GIF !contains(QT_CONFIG, no-jpeg):DEFINES += QTEST_HAVE_JPEG -!contains(QT_CONFIG, no-tiff):DEFINES += QTEST_HAVE_TIFF diff --git a/tests/benchmarks/gui/image/qimagereader/images/corrupt-data.tif b/tests/benchmarks/gui/image/qimagereader/images/corrupt-data.tif deleted file mode 100644 index d63c688b27..0000000000 Binary files a/tests/benchmarks/gui/image/qimagereader/images/corrupt-data.tif and /dev/null differ diff --git a/tests/benchmarks/gui/image/qimagereader/images/rgba_adobedeflate_littleendian.tif b/tests/benchmarks/gui/image/qimagereader/images/rgba_adobedeflate_littleendian.tif deleted file mode 100644 index 78868b0d48..0000000000 Binary files a/tests/benchmarks/gui/image/qimagereader/images/rgba_adobedeflate_littleendian.tif and /dev/null differ diff --git a/tests/benchmarks/gui/image/qimagereader/images/rgba_lzw_littleendian.tif b/tests/benchmarks/gui/image/qimagereader/images/rgba_lzw_littleendian.tif deleted file mode 100644 index 107eab74e7..0000000000 Binary files a/tests/benchmarks/gui/image/qimagereader/images/rgba_lzw_littleendian.tif and /dev/null differ diff --git a/tests/benchmarks/gui/image/qimagereader/images/rgba_nocompression_bigendian.tif b/tests/benchmarks/gui/image/qimagereader/images/rgba_nocompression_bigendian.tif deleted file mode 100644 index c314bae4c0..0000000000 Binary files a/tests/benchmarks/gui/image/qimagereader/images/rgba_nocompression_bigendian.tif and /dev/null differ diff --git a/tests/benchmarks/gui/image/qimagereader/images/rgba_nocompression_littleendian.tif b/tests/benchmarks/gui/image/qimagereader/images/rgba_nocompression_littleendian.tif deleted file mode 100644 index 4f820f6649..0000000000 Binary files a/tests/benchmarks/gui/image/qimagereader/images/rgba_nocompression_littleendian.tif and /dev/null differ diff --git a/tests/benchmarks/gui/image/qimagereader/images/rgba_packbits_littleendian.tif b/tests/benchmarks/gui/image/qimagereader/images/rgba_packbits_littleendian.tif deleted file mode 100644 index ddeec38fbc..0000000000 Binary files a/tests/benchmarks/gui/image/qimagereader/images/rgba_packbits_littleendian.tif and /dev/null differ diff --git a/tests/benchmarks/gui/image/qimagereader/images/rgba_zipdeflate_littleendian.tif b/tests/benchmarks/gui/image/qimagereader/images/rgba_zipdeflate_littleendian.tif deleted file mode 100644 index 50a3024246..0000000000 Binary files a/tests/benchmarks/gui/image/qimagereader/images/rgba_zipdeflate_littleendian.tif and /dev/null differ diff --git a/tests/benchmarks/gui/image/qimagereader/qimagereader.pro b/tests/benchmarks/gui/image/qimagereader/qimagereader.pro index 8e5faca575..cc2c8e0701 100644 --- a/tests/benchmarks/gui/image/qimagereader/qimagereader.pro +++ b/tests/benchmarks/gui/image/qimagereader/qimagereader.pro @@ -7,7 +7,6 @@ SOURCES += tst_qimagereader.cpp !contains(QT_CONFIG, no-gif):DEFINES += QTEST_HAVE_GIF !contains(QT_CONFIG, no-jpeg):DEFINES += QTEST_HAVE_JPEG -!contains(QT_CONFIG, no-tiff):DEFINES += QTEST_HAVE_TIFF QT += network wince*: { -- cgit v1.2.3