[rkward] rkward: Fix compilation on ARM. Thanks to Tom Callaway.
Thomas Friedrichsmeier
thomas.friedrichsmeier at ruhr-uni-bochum.de
Wed Mar 11 12:04:54 UTC 2015
Git commit 5140386f1904589c1c8bcc07d411968bdfb8dba4 by Thomas Friedrichsmeier.
Committed on 11/03/2015 at 12:04.
Pushed by tfry into branch 'master'.
Fix compilation on ARM. Thanks to Tom Callaway.
M +1 -1 rkward/plugin/rkpluginspinbox.cpp
M +1 -1 rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp
http://commits.kde.org/rkward/5140386f1904589c1c8bcc07d411968bdfb8dba4
diff --git a/rkward/plugin/rkpluginspinbox.cpp b/rkward/plugin/rkpluginspinbox.cpp
index dda53d7..f637fdf 100644
--- a/rkward/plugin/rkpluginspinbox.cpp
+++ b/rkward/plugin/rkpluginspinbox.cpp
@@ -50,7 +50,7 @@ RKPluginSpinBox::RKPluginSpinBox (const QDomElement &element, RKComponent *paren
if (!intmode) {
double min = xml->getDoubleAttribute (element, "min", -FLT_MAX, DL_INFO);
double max = xml->getDoubleAttribute (element, "max", FLT_MAX, DL_INFO);
- double initial = xml->getDoubleAttribute (element, "initial", qMin (max, qMax (min, qreal(0.0))), DL_INFO);
+ double initial = xml->getDoubleAttribute (element, "initial", qMin (max, qMax (min, double (qreal(0.0)))), DL_INFO);
int default_precision = xml->getIntAttribute (element, "default_precision", 2, DL_INFO);
int max_precision = xml->getIntAttribute (element, "max_precision", 8, DL_INFO);
diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp
index 831c71f..76264b4 100644
--- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp
+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp
@@ -105,7 +105,7 @@ static QPen readSimplePen (QDataStream &instream) {
instream >> lwd >> lty;
if (!col.isValid () || (lty == -1L)) return QPen (Qt::NoPen);
- lwd = qMax (qreal(1.0), lwd); // minimum 1 px as in X11 device
+ lwd = qMax (double(qreal(1.0)), lwd); // minimum 1 px as in X11 device
QPen ret;
if (lty != 0) { // solid
QVector<qreal> dashes;
More information about the rkward-tracker
mailing list