diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-24 03:00:12 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-24 03:00:12 +0100 |
commit | 7142f2d83b5f838702dc11f9706abb51eb9898d7 (patch) | |
tree | 56fc6f44f79d2dacc96645bdbec78aeac1ea93c2 /src/multimediawidgets/qpaintervideosurface.cpp | |
parent | 2845e10810a50d6cba4f19a27cfefac10b06929a (diff) | |
parent | 58d83703d7d5435a74d59bdb906ca6a76b54f78f (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I565a3c7ded4223b6f3b5dfa4fcbbf21aff73a696
Diffstat (limited to 'src/multimediawidgets/qpaintervideosurface.cpp')
-rw-r--r-- | src/multimediawidgets/qpaintervideosurface.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp index 0147690e1..0396f9fc0 100644 --- a/src/multimediawidgets/qpaintervideosurface.cpp +++ b/src/multimediawidgets/qpaintervideosurface.cpp @@ -202,12 +202,13 @@ QAbstractVideoSurface::Error QVideoSurfaceGenericPainter::paint( if (m_scanLineDirection == QVideoSurfaceFormat::BottomToTop) { transform.scale(1, -1); transform.translate(0, -target.bottom()); - targetRect.setY(0); + targetRect = QRectF(target.x(), 0, target.width(), target.height()); } + if (m_mirrored) { transform.scale(-1, 1); transform.translate(-target.right(), 0); - targetRect.setX(0); + targetRect = QRectF(0, targetRect.y(), target.width(), target.height()); } painter->setTransform(transform); painter->drawImage(targetRect, image, source); |