diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-12 03:02:38 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-12 03:02:39 +0100 |
| commit | 1f9bbe1f991237453d145f552d08c83bb44b6cc6 (patch) | |
| tree | 2ae8b82ae09941990e726a821263da0edf049d65 | |
| parent | d44f6ddba7b42bcc3fdd15274ef9bab19877f4f3 (diff) | |
| parent | 7044c0c82c1bccbff9f7ab0d8344c89fcf7cc043 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I8cf35c280a3b0406376302f637604655348b9764
| -rw-r--r-- | tests/manual/volumetrictest/volumetrictest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/manual/volumetrictest/volumetrictest.cpp b/tests/manual/volumetrictest/volumetrictest.cpp index 09dae433..6b2a57a8 100644 --- a/tests/manual/volumetrictest/volumetrictest.cpp +++ b/tests/manual/volumetrictest/volumetrictest.cpp @@ -381,7 +381,7 @@ void VolumetricModifier::createVolume() logo.load(QStringLiteral(":/logo_no_padding.png")); //logo.load(QStringLiteral(":/logo.png")); qDebug() << "image dimensions:" << logo.width() << logo.height() - << logo.byteCount() << (logo.width() * logo.height()) + << logo.sizeInBytes() << (logo.width() * logo.height()) << logo.bytesPerLine(); QVector<QImage *> imageArray(imageCount); @@ -535,7 +535,7 @@ void VolumetricModifier::createAnotherVolume() //logo.load(QStringLiteral(":/logo.png")); logo = logo.convertToFormat(QImage::Format_ARGB8555_Premultiplied); qDebug() << "second image dimensions:" << logo.width() << logo.height() - << logo.byteCount() << (logo.width() * logo.height()) + << logo.sizeInBytes() << (logo.width() * logo.height()) << logo.bytesPerLine(); logo.save("d:/qt/goobar.png"); |