diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-02-20 13:45:32 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-09 00:14:49 +0100 |
commit | d263ab6af5bd264217cb0beb389586163c5a8348 (patch) | |
tree | 675bb2ec7de6cb174bd938903bf3079872a58086 /tests | |
parent | aa5f3c829c308b6765aa390524ad840bd33258e8 (diff) |
Create consistent sets of QImage methods
Adds consistently named inplace and imperative methods.
Change-Id: I8739c1c4585d2ba4aa181bb9a681255d76c120d7
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/gui/image/qimage/tst_qimage.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp index 7fcbabd532..db5e474711 100644 --- a/tests/auto/gui/image/qimage/tst_qimage.cpp +++ b/tests/auto/gui/image/qimage/tst_qimage.cpp @@ -2431,11 +2431,11 @@ void tst_QImage::rgbSwapped() QCOMPARE(swappedColor.blue(), referenceColor.red()); } - QImage imageSwappedTwice = imageSwapped.rgbSwapped(); + imageSwapped.rgbSwap(); - QCOMPARE(image, imageSwappedTwice); + QCOMPARE(image, imageSwapped); - QCOMPARE(memcmp(image.constBits(), imageSwappedTwice.constBits(), image.sizeInBytes()), 0); + QCOMPARE(memcmp(image.constBits(), imageSwapped.constBits(), image.sizeInBytes()), 0); } void tst_QImage::mirrored_data() @@ -2543,16 +2543,16 @@ void tst_QImage::mirrored() } } - QImage imageMirroredTwice = imageMirrored.mirrored(swap_horizontal, swap_vertical); + imageMirrored.mirror(swap_horizontal, swap_vertical); - QCOMPARE(image, imageMirroredTwice); + QCOMPARE(image, imageMirrored); if (format != QImage::Format_Mono && format != QImage::Format_MonoLSB) - QCOMPARE(memcmp(image.constBits(), imageMirroredTwice.constBits(), image.sizeInBytes()), 0); + QCOMPARE(memcmp(image.constBits(), imageMirrored.constBits(), image.sizeInBytes()), 0); else { for (int i = 0; i < image.height(); ++i) for (int j = 0; j < image.width(); ++j) - QCOMPARE(image.pixel(j,i), imageMirroredTwice.pixel(j,i)); + QCOMPARE(image.pixel(j,i), imageMirrored.pixel(j,i)); } } |