1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QImage: fix discarded QFile::open() results

Browse Source 
Wrap them in QVERIFY(), as usual.

Found by QFile::open()-turned-nodiscard-come-6.10.

Amends e673e5a257569eaa816c6acd31dd754efd9f8c75 and
25c96d547b4563cbfedcec6093d68116148d8599.

Change-Id: Id39e5d9e500b524af8443cb57916a12f98bd7c23
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit cf6ae9a90106a3557a8df1e0d2567b02a4ef6ded)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 11f485ea68cff32f550c3d99475bb859a7495f69)
This commit is contained in:
Marc Mutz 2024-12-30 22:35:12 +01:00 committed by Qt Cherry-pick Bot
parent 5fc8ca9cdd
commit fb5fb04fb7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/gui/image/qimage/tst_qimage.cpp
View File

@ -3431,7 +3431,7 @@ void tst_QImage::colorSpaceCmykConversion()
QImage image(16, 16, QImage::Format_CMYK8888); QImage image(16, 16, QImage::Format_CMYK8888);
QFile iccProfile(m_prefix +"CGATS001Compat-v2-micro.icc"); QFile iccProfile(m_prefix +"CGATS001Compat-v2-micro.icc");
iccProfile.open(QIODevice::ReadOnly); QVERIFY2(iccProfile.open(QIODevice::ReadOnly), qPrintable(iccProfile.errorString()));
image.setColorSpace(QColorSpace::fromIccProfile(iccProfile.readAll())); image.setColorSpace(QColorSpace::fromIccProfile(iccProfile.readAll()));
QVERIFY(image.colorSpace().isValid()); QVERIFY(image.colorSpace().isValid());
@ -3490,7 +3490,7 @@ void tst_QImage::colorSpaceFromGrayConversion_data()
}; };
QFile iccProfile(m_prefix + "VideoHD.icc"); QFile iccProfile(m_prefix + "VideoHD.icc");
iccProfile.open(QIODevice::ReadOnly); QVERIFY2(iccProfile.open(QIODevice::ReadOnly), qPrintable(iccProfile.errorString()));
colorSpaces.append(QColorSpace::fromIccProfile(iccProfile.readAll())); colorSpaces.append(QColorSpace::fromIccProfile(iccProfile.readAll()));
for (auto fromFormat : formats) { for (auto fromFormat : formats) {