[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra] karbon/plugins/filtereffects: use explicit cast to qreal
From:       Jan Hambrecht <jaham () gmx ! net>
Date:       2012-06-04 12:57:56
Message-ID: 20120604125756.B53A9A60CB () git ! kde ! org
[Download RAW message or body]

Git commit 5a95c42cca5f7b946ab37addf003674ac5eaaeaa by Jan Hambrecht.
Committed on 04/06/2012 at 14:57.
Pushed by jaham into branch 'master'.

use explicit cast to qreal

M  +17   -17   karbon/plugins/filtereffects/BlendEffect.cpp

http://commits.kde.org/calligra/5a95c42cca5f7b946ab37addf003674ac5eaaeaa

diff --git a/karbon/plugins/filtereffects/BlendEffect.cpp b/karbon/plugins/filtereffects/BlendEffect.cpp
index 9a43c77..d571063 100644
--- a/karbon/plugins/filtereffects/BlendEffect.cpp
+++ b/karbon/plugins/filtereffects/BlendEffect.cpp
@@ -88,14 +88,14 @@ QImage BlendEffect::processImages(const QList<QImage> &images, const KoFilterEff
 
             switch (m_blendMode) {
             case Normal:
-                dr = (1.0 - da) * sr + dr;
-                dg = (1.0 - da) * sg + dg;
-                db = (1.0 - da) * sb + db;
+                dr = (qreal(1.0) - da) * sr + dr;
+                dg = (qreal(1.0) - da) * sg + dg;
+                db = (qreal(1.0) - da) * sb + db;
                 break;
             case Multiply:
-                dr = (1.0 - da) * sr + (1.0 - sa) * dr + dr * sr;
-                dg = (1.0 - da) * sg + (1.0 - sa) * dg + dg * sg;
-                db = (1.0 - da) * sb + (1.0 - sa) * db + db * sb;
+                dr = (qreal(1.0) - da) * sr + (qreal(1.0) - sa) * dr + dr * sr;
+                dg = (qreal(1.0) - da) * sg + (qreal(1.0) - sa) * dg + dg * sg;
+                db = (qreal(1.0) - da) * sb + (qreal(1.0) - sa) * db + db * sb;
                 break;
             case Screen:
                 dr = sr + dr - dr * sr;
@@ -103,22 +103,22 @@ QImage BlendEffect::processImages(const QList<QImage> &images, const KoFilterEff
                 db = sb + db - db * sb;
                 break;
             case Darken:
-                dr = qMin((1.0 - da) * sr + dr, (1.0 - sa) * dr + sr);
-                dg = qMin((1.0 - da) * sg + dg, (1.0 - sa) * dg + sg);
-                db = qMin((1.0 - da) * sb + db, (1.0 - sa) * db + sb);
+                dr = qMin((qreal(1.0) - da) * sr + dr, (qreal(1.0) - sa) * dr + sr);
+                dg = qMin((qreal(1.0) - da) * sg + dg, (qreal(1.0) - sa) * dg + sg);
+                db = qMin((qreal(1.0) - da) * sb + db, (qreal(1.0) - sa) * db + sb);
                 break;
             case Lighten:
-                dr = qMax((1.0 - da) * sr + dr, (1.0 - sa) * dr + sr);
-                dg = qMax((1.0 - da) * sg + dg, (1.0 - sa) * dg + sg);
-                db = qMax((1.0 - da) * sb + db, (1.0 - sa) * db + sb);
+                dr = qMax((qreal(1.0) - da) * sr + dr, (qreal(1.0) - sa) * dr + sr);
+                dg = qMax((qreal(1.0) - da) * sg + dg, (qreal(1.0) - sa) * dg + sg);
+                db = qMax((qreal(1.0) - da) * sb + db, (qreal(1.0) - sa) * db + sb);
                 break;
             }
-            da = 1.0 - (1.0 - da) * (1.0 - sa);
+            da = qreal(1.0) - (qreal(1.0) - da) * (qreal(1.0) - sa);
 
-            d = qRgba(static_cast<quint8>(qBound(0.0, dr * 255.0, 255.0)),
-                      static_cast<quint8>(qBound(0.0, dg * 255.0, 255.0)),
-                      static_cast<quint8>(qBound(0.0, db * 255.0, 255.0)),
-                      static_cast<quint8>(qBound(0.0, da * 255.0, 255.0)));
+            d = qRgba(static_cast<quint8>(qBound(qreal(0.0), dr * qreal(255.0), qreal(255.0))),
+                      static_cast<quint8>(qBound(qreal(0.0), dg * qreal(255.0), qreal(255.0))),
+                      static_cast<quint8>(qBound(qreal(0.0), db * qreal(255.0), qreal(255.0))),
+                      static_cast<quint8>(qBound(qreal(0.0), da * qreal(255.0), qreal(255.0))));
         }
     }
 

[prev in list] [next in list] [prev in thread] [next in thread]