[calligra] fix qreal!=double issues
Rex Dieter
rdieter at fedoraproject.org
Sun Dec 15 03:16:33 UTC 2013
commit f3834cf4935b53c38d477693b7461d0ce00a95dd
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Sat Dec 14 21:16:07 2013 -0600
fix qreal!=double issues
calligra-2.7.90-qreal.patch | 23 +++++++++++++++++++++++
calligra.spec | 2 ++
2 files changed, 25 insertions(+), 0 deletions(-)
---
diff --git a/calligra-2.7.90-qreal.patch b/calligra-2.7.90-qreal.patch
new file mode 100644
index 0000000..e0e702e
--- /dev/null
+++ b/calligra-2.7.90-qreal.patch
@@ -0,0 +1,23 @@
+diff -up calligra-2.7.90/krita/image/kis_distance_information.cpp.qreal calligra-2.7.90/krita/image/kis_distance_information.cpp
+--- calligra-2.7.90/krita/image/kis_distance_information.cpp.qreal 2013-12-01 12:24:22.000000000 -0600
++++ calligra-2.7.90/krita/image/kis_distance_information.cpp 2013-12-14 21:15:20.383029355 -0600
+@@ -132,7 +132,7 @@ qreal KisDistanceInformation::getNextPoi
+ const QPointF &end)
+ {
+ qreal distance = m_d->distance.x();
+- qreal spacing = qMax(0.5, m_d->spacing.spacing().x());
++ qreal spacing = qMax(qreal(0.5), m_d->spacing.spacing().x());
+
+ if (start == end) {
+ return -1;
+@@ -161,8 +161,8 @@ qreal KisDistanceInformation::getNextPoi
+ return -1;
+ }
+
+- qreal a_rev = 1.0 / qMax(0.5, m_d->spacing.spacing().x());
+- qreal b_rev = 1.0 / qMax(0.5, m_d->spacing.spacing().y());
++ qreal a_rev = 1.0 / qMax(qreal(0.5), m_d->spacing.spacing().x());
++ qreal b_rev = 1.0 / qMax(qreal(0.5), m_d->spacing.spacing().y());
+
+ qreal x = m_d->distance.x();
+ qreal y = m_d->distance.y();
diff --git a/calligra.spec b/calligra.spec
index f1a81a2..ff6a0cc 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -33,6 +33,7 @@ Source0: http://download.kde.org/%{stable}/calligra-%{version}/calligra-%{versio
Patch1: calligra-2.7.90-no_mpxj.patch
## upstreamable patches
+Patch50: calligra-2.7.90-qreal.patch
## upstream patches
@@ -458,6 +459,7 @@ Requires: %{name}-core = %{version}-%{release}
%if ! 0%{?mpxj}
%patch1 -p1 -b .no_mpxj
%endif
+%patch50 -p1 -b .qreal
## kdchart munging begin
pushd 3rdparty/kdchart
More information about the scm-commits
mailing list