summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp')
-rw-r--r--tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp134
1 files changed, 12 insertions, 122 deletions
diff --git a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
index 4886a58104..8473597dac 100644
--- a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
+++ b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
@@ -82,13 +82,6 @@ private slots:
void writeImage2();
void supportedFormats();
- void readWriteNonDestructive_data();
- void readWriteNonDestructive();
-
-#if defined QTEST_HAVE_TIFF
- void largeTiff();
-#endif
-
void writeToInvalidDevice();
void supportsOption_data();
@@ -97,14 +90,17 @@ private slots:
void saveWithNoFormat_data();
void saveWithNoFormat();
- void resolution_data();
- void resolution();
-
void saveToTemporaryFile();
private:
QString prefix;
};
+// helper to skip an autotest when the given image format is not supported
+#define SKIP_IF_UNSUPPORTED(format) do { \
+ if (!QByteArray(format).isEmpty() && !QImageReader::supportedImageFormats().contains(format)) \
+ QSKIP("\"" + QByteArray(format) + "\" images are not supported"); \
+} while (0)
+
static void initializePadding(QImage *image)
{
int effectiveBytesPerLine = (image->width() * image->depth() + 7) / 8;
@@ -202,9 +198,6 @@ void tst_QImageWriter::writeImage_data()
QTest::newRow("PBM: ship63") << QString("ship63.pbm") << true << QByteArray("pbm");
QTest::newRow("XBM: gnus") << QString("gnus.xbm") << false << QByteArray("xbm");
QTest::newRow("JPEG: beavis") << QString("beavis.jpg") << true << QByteArray("jpeg");
-#if defined QTEST_HAVE_TIFF
- QTest::newRow("TIFF: teapot") << QString("teapot.tiff") << false << QByteArray("tiff");
-#endif
}
void tst_QImageWriter::writeImage()
@@ -213,6 +206,8 @@ void tst_QImageWriter::writeImage()
QFETCH(bool, lossy);
QFETCH(QByteArray, format);
+ SKIP_IF_UNSUPPORTED(format);
+
QImage image;
{
QImageReader reader(prefix + fileName);
@@ -283,41 +278,6 @@ void tst_QImageWriter::writeImage2_data()
}
}
-#if defined QTEST_HAVE_TIFF
-void tst_QImageWriter::largeTiff()
-{
-#if !defined(Q_OS_WINCE)
- QImage img(4096, 2048, QImage::Format_ARGB32);
-
- QPainter p(&img);
- img.fill(0x0);
- p.fillRect(0, 0, 4096, 2048, QBrush(Qt::CrossPattern));
- p.end();
-
- QByteArray array;
- QBuffer writeBuffer(&array);
- writeBuffer.open(QIODevice::WriteOnly);
-
- QImageWriter writer(&writeBuffer, "tiff");
- QVERIFY(writer.write(img));
-
- writeBuffer.close();
-
- QBuffer readBuffer(&array);
- readBuffer.open(QIODevice::ReadOnly);
-
- QImageReader reader(&readBuffer, "tiff");
-
- QImage img2 = reader.read();
- QVERIFY(!img2.isNull());
-
- QCOMPARE(img, img2);
-#else
- QWARN("not tested on WinCE");
-#endif
-}
-#endif
-
/*
Workaround for the equality operator for indexed formats
(which fails if the colortables are different).
@@ -392,39 +352,6 @@ void tst_QImageWriter::supportedFormats()
QCOMPARE(formatSet.size(), formats.size());
}
-void tst_QImageWriter::readWriteNonDestructive_data()
-{
- QTest::addColumn<QImage::Format>("format");
- QTest::addColumn<QImage::Format>("expectedFormat");
- QTest::addColumn<bool>("grayscale");
- QTest::newRow("tiff mono") << QImage::Format_Mono << QImage::Format_Mono << false;
- QTest::newRow("tiff indexed") << QImage::Format_Indexed8 << QImage::Format_Indexed8 << false;
- QTest::newRow("tiff rgb32") << QImage::Format_ARGB32 << QImage::Format_ARGB32 << false;
- QTest::newRow("tiff grayscale") << QImage::Format_Indexed8 << QImage::Format_Indexed8 << true;
-}
-
-void tst_QImageWriter::readWriteNonDestructive()
-{
- QFETCH(QImage::Format, format);
- QFETCH(QImage::Format, expectedFormat);
- QFETCH(bool, grayscale);
- QImage image = QImage(prefix + "colorful.bmp").convertToFormat(format);
-
- if (grayscale) {
- QVector<QRgb> colors;
- for (int i = 0; i < 256; ++i)
- colors << qRgb(i, i, i);
- image.setColorTable(colors);
- }
-
- QVERIFY(image.save(prefix + "gen-readWriteNonDestructive.tiff"));
-
- QImage image2 = QImage(prefix + "gen-readWriteNonDestructive.tiff");
- QImage::Format readFormat = image2.format();
- QCOMPARE(readFormat, expectedFormat);
- QCOMPARE(image, image2);
-}
-
void tst_QImageWriter::writeToInvalidDevice()
{
QLatin1String fileName("/these/directories/do/not/exist/001.png");
@@ -464,15 +391,12 @@ void tst_QImageWriter::supportsOption_data()
<< QImageIOHandler::Description
<< QImageIOHandler::Quality
<< QImageIOHandler::Size);
-#if defined QTEST_HAVE_TIFF
- QTest::newRow("tiff") << QString("gen-black.tiff")
- << (QIntList() << QImageIOHandler::Size
- << QImageIOHandler::CompressionRatio);
-#endif
}
void tst_QImageWriter::supportsOption()
{
+ SKIP_IF_UNSUPPORTED(QTest::currentDataTag());
+
QFETCH(QString, fileName);
QFETCH(QIntList, options);
@@ -515,9 +439,6 @@ void tst_QImageWriter::saveWithNoFormat_data()
QTest::newRow("png") << prefix + QString("gen-out.png") << QByteArray("png") << QImageWriter::ImageWriterError(0);
QTest::newRow("ppm") << prefix + QString("gen-out.ppm") << QByteArray("ppm") << QImageWriter::ImageWriterError(0);
QTest::newRow("pbm") << prefix + QString("gen-out.pbm") << QByteArray("pbm") << QImageWriter::ImageWriterError(0);
-#if defined QTEST_HAVE_TIFF
- QTest::newRow("tiff") << prefix + QString("gen-out.tiff") << QByteArray("tiff") << QImageWriter::ImageWriterError(0);
-#endif
}
void tst_QImageWriter::saveWithNoFormat()
@@ -526,6 +447,8 @@ void tst_QImageWriter::saveWithNoFormat()
QFETCH(QByteArray, format);
QFETCH(QImageWriter::ImageWriterError, error);
+ SKIP_IF_UNSUPPORTED(format);
+
QImage niceImage(64, 64, QImage::Format_ARGB32);
qMemSet(niceImage.bits(), 0, niceImage.byteCount());
@@ -547,39 +470,6 @@ void tst_QImageWriter::saveWithNoFormat()
QVERIFY2(!outImage.isNull(), qPrintable(reader.errorString()));
}
-void tst_QImageWriter::resolution_data()
-{
- QTest::addColumn<QString>("filename");
- QTest::addColumn<int>("expectedDotsPerMeterX");
- QTest::addColumn<int>("expectedDotsPerMeterY");
-#if defined QTEST_HAVE_TIFF
- QTest::newRow("TIFF: 100 dpi") << ("image_100dpi.tif") << qRound(100 * (100 / 2.54)) << qRound(100 * (100 / 2.54));
- QTest::newRow("TIFF: 50 dpi") << ("image_50dpi.tif") << qRound(50 * (100 / 2.54)) << qRound(50 * (100 / 2.54));
- QTest::newRow("TIFF: 300 dot per meter") << ("image_300dpm.tif") << 300 << 300;
-#endif
-}
-
-void tst_QImageWriter::resolution()
-{
- QFETCH(QString, filename);
- QFETCH(int, expectedDotsPerMeterX);
- QFETCH(int, expectedDotsPerMeterY);
-
- QImage image(prefix + QLatin1String("colorful.bmp"));
- image.setDotsPerMeterX(expectedDotsPerMeterX);
- image.setDotsPerMeterY(expectedDotsPerMeterY);
- const QString generatedFilepath = prefix + "gen-" + filename;
- {
- QImageWriter writer(generatedFilepath);
- QVERIFY(writer.write(image));
- }
- QImageReader reader(generatedFilepath);
- const QImage generatedImage = reader.read();
-
- QCOMPARE(expectedDotsPerMeterX, generatedImage.dotsPerMeterX());
- QCOMPARE(expectedDotsPerMeterY, generatedImage.dotsPerMeterY());
-}
-
void tst_QImageWriter::saveToTemporaryFile()
{
QImage image(prefix + "kollada.png");
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 19:10:54 +0000