Sophie

Sophie

distrib > Mageia > 6 > x86_64 > by-pkgid > de50030052fc1b39eaef8dbc4cb7f97c > files > 1

andromeda-0.3-6.mga6.src.rpm

diff --git a/src/libs/imageviewer/imageview.cpp b/src/libs/imageviewer/imageview.cpp
index 6a36d58..99435bb 100644
--- a/src/libs/imageviewer/imageview.cpp
+++ b/src/libs/imageviewer/imageview.cpp
@@ -612,9 +612,9 @@ qreal ImageViewPrivate::getFitInViewFactor() const
     else if (rw > 1 && rh < 1)
         factor = rh;
     else if (rw < 1 && rh < 1)
-        factor = qMin(rw, rh);
+        factor = qMin(qreal(rw), qreal(rh));
     else
-        factor = qMin(rw, rh);
+        factor = qMin(qreal(rw), qreal(rh));
 
     return factor;
 }
@@ -1179,7 +1179,7 @@ void ImageView::bestFit()
         return;
 
     qreal factor = d->getFitInViewFactor();
-    factor = qMin(factor, 1.0);
+    factor = qMin(factor, qreal(1.0));
     d->setZoomFactor(factor);
 }