diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-04 09:00:23 +1000 |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-04 09:00:23 +1000 |
| commit | 897014a47b41dcf2b9d91549be9b96890d5291c7 (patch) | |
| tree | 91da900adb42122eebdef573c012051ea511e42d /src/3rdparty/phonon/ds9/abstractvideorenderer.cpp | |
| parent | 37cdd053623bfadded77ba6ad34e0d4c45158cc7 (diff) | |
| parent | 2076f150995e541308b1d8da936b3e12ab68b886 (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/3rdparty/phonon/ds9/abstractvideorenderer.cpp')
| -rw-r--r-- | src/3rdparty/phonon/ds9/abstractvideorenderer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/phonon/ds9/abstractvideorenderer.cpp b/src/3rdparty/phonon/ds9/abstractvideorenderer.cpp index e932e7096..a9d069455 100644 --- a/src/3rdparty/phonon/ds9/abstractvideorenderer.cpp +++ b/src/3rdparty/phonon/ds9/abstractvideorenderer.cpp @@ -99,8 +99,8 @@ namespace Phonon m_dstX = m_dstY = 0; if (ratio > 0) { - if (realWidth / realHeight > ratio && scaleMode == Phonon::VideoWidget::FitInView - || realWidth / realHeight < ratio && scaleMode == Phonon::VideoWidget::ScaleAndCrop) { + if ((realWidth / realHeight > ratio && scaleMode == Phonon::VideoWidget::FitInView) + || (realWidth / realHeight < ratio && scaleMode == Phonon::VideoWidget::ScaleAndCrop)) { //the height is correct, let's change the width m_dstWidth = qRound(realHeight * ratio); m_dstX = qRound((realWidth - realHeight * ratio) / 2.); |