From kde-commits  Mon Jun 04 12:57:56 2012
From: Jan Hambrecht <jaham () gmx ! net>
Date: Mon, 04 Jun 2012 12:57:56 +0000
To: kde-commits
Subject: [calligra] karbon/plugins/filtereffects: use explicit cast to qreal
Message-Id: <20120604125756.B53A9A60CB () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=133881486421747

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 =3D (1.0 - da) * sr + dr;
-                dg =3D (1.0 - da) * sg + dg;
-                db =3D (1.0 - da) * sb + db;
+                dr =3D (qreal(1.0) - da) * sr + dr;
+                dg =3D (qreal(1.0) - da) * sg + dg;
+                db =3D (qreal(1.0) - da) * sb + db;
                 break;
             case Multiply:
-                dr =3D (1.0 - da) * sr + (1.0 - sa) * dr + dr * sr;
-                dg =3D (1.0 - da) * sg + (1.0 - sa) * dg + dg * sg;
-                db =3D (1.0 - da) * sb + (1.0 - sa) * db + db * sb;
+                dr =3D (qreal(1.0) - da) * sr + (qreal(1.0) - sa) * dr + d=
r * sr;
+                dg =3D (qreal(1.0) - da) * sg + (qreal(1.0) - sa) * dg + d=
g * sg;
+                db =3D (qreal(1.0) - da) * sb + (qreal(1.0) - sa) * db + d=
b * sb;
                 break;
             case Screen:
                 dr =3D sr + dr - dr * sr;
@@ -103,22 +103,22 @@ QImage BlendEffect::processImages(const QList<QImage>=
 &images, const KoFilterEff
                 db =3D sb + db - db * sb;
                 break;
             case Darken:
-                dr =3D qMin((1.0 - da) * sr + dr, (1.0 - sa) * dr + sr);
-                dg =3D qMin((1.0 - da) * sg + dg, (1.0 - sa) * dg + sg);
-                db =3D qMin((1.0 - da) * sb + db, (1.0 - sa) * db + sb);
+                dr =3D qMin((qreal(1.0) - da) * sr + dr, (qreal(1.0) - sa)=
 * dr + sr);
+                dg =3D qMin((qreal(1.0) - da) * sg + dg, (qreal(1.0) - sa)=
 * dg + sg);
+                db =3D qMin((qreal(1.0) - da) * sb + db, (qreal(1.0) - sa)=
 * db + sb);
                 break;
             case Lighten:
-                dr =3D qMax((1.0 - da) * sr + dr, (1.0 - sa) * dr + sr);
-                dg =3D qMax((1.0 - da) * sg + dg, (1.0 - sa) * dg + sg);
-                db =3D qMax((1.0 - da) * sb + db, (1.0 - sa) * db + sb);
+                dr =3D qMax((qreal(1.0) - da) * sr + dr, (qreal(1.0) - sa)=
 * dr + sr);
+                dg =3D qMax((qreal(1.0) - da) * sg + dg, (qreal(1.0) - sa)=
 * dg + sg);
+                db =3D qMax((qreal(1.0) - da) * sb + db, (qreal(1.0) - sa)=
 * db + sb);
                 break;
             }
-            da =3D 1.0 - (1.0 - da) * (1.0 - sa);
+            da =3D qreal(1.0) - (qreal(1.0) - da) * (qreal(1.0) - sa);
 =

-            d =3D 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 =3D qRgba(static_cast<quint8>(qBound(qreal(0.0), dr * qreal(=
255.0), qreal(255.0))),
+                      static_cast<quint8>(qBound(qreal(0.0), dg * qreal(25=
5.0), qreal(255.0))),
+                      static_cast<quint8>(qBound(qreal(0.0), db * qreal(25=
5.0), qreal(255.0))),
+                      static_cast<quint8>(qBound(qreal(0.0), da * qreal(25=
5.0), qreal(255.0))));
         }
     }
 =