Skip to content

fix: use QImage::flipped() for Qt6 compatibility #409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kt286 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: use QImage::flipped() for Qt6 compatibility #409

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion src/util/dimagehandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2022 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later

Expand Down Expand Up @@ -439,24 +439,40 @@ void DImageHandlerPrivate::adjustImageToRealOrientation(QImage &image, ExifImage
switch (orientation) {
// TopLeft unnecessary rotate/flip
case TopRight: // Horizontal flip
#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
image = image.flipped(Qt::Horizontal);
#else
image = image.mirrored(true, false);
#endif
break;
case BottomRight:
rotateImage(image, 180);
break;
case BottomLeft: // Vertical flip
#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
image = image.flipped(Qt::Vertical);
#else
image = image.mirrored(false, true);
#endif
break;
case LeftTop: // Clockwise 90 degrees and horizontal flip
rotateImage(image, 90);
#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
image = image.flipped(Qt::Horizontal);
#else
image = image.mirrored(true, false);
#endif
break;
case RightTop:
rotateImage(image, 90);
break;
case RightBottom: // Clockwise 90 degrees and vertical flip
rotateImage(image, 90);
#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
image = image.flipped(Qt::Vertical);
#else
image = image.mirrored(false, true);
#endif
break;
case LeftBottom: // Counterclockwise 90 degrees
rotateImage(image, -90);
Expand Down Expand Up @@ -1527,12 +1543,20 @@ QImage DImageHandler::replacePointColor(const QImage &img, QColor oldColor, QCol

QImage DImageHandler::flipHorizontal(const QImage &img)
{
#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
return img.flipped(Qt::Horizontal);
#else
return img.mirrored(true, false);
#endif
}

QImage DImageHandler::flipVertical(const QImage &img)
{
#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
return img.flipped(Qt::Vertical);
#else
return img.mirrored(false, true);
#endif
}

DGUI_END_NAMESPACE
Loading