[calligra] first/naive qreal fix
Rex Dieter
rdieter at fedoraproject.org
Mon Feb 10 18:56:44 UTC 2014
commit 425788fd06a19e03acfb5a82ab46cab703cbc7ba
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Feb 10 12:56:59 2014 -0600
first/naive qreal fix
calligra-2.7.92-qreal.patch | 20 ++++++++++++++++++++
calligra.spec | 2 ++
2 files changed, 22 insertions(+), 0 deletions(-)
---
diff --git a/calligra-2.7.92-qreal.patch b/calligra-2.7.92-qreal.patch
new file mode 100644
index 0000000..7e2775c
--- /dev/null
+++ b/calligra-2.7.92-qreal.patch
@@ -0,0 +1,20 @@
+diff -up calligra-2.7.92/krita/image/kis_convolution_painter.cc.qreal calligra-2.7.92/krita/image/kis_convolution_painter.cc
+diff -up calligra-2.7.92/krita/image/kis_convolution_worker_spatial.h.qreal calligra-2.7.92/krita/image/kis_convolution_worker_spatial.h
+--- calligra-2.7.92/krita/image/kis_convolution_worker_spatial.h.qreal 2014-02-09 04:18:42.000000000 -0600
++++ calligra-2.7.92/krita/image/kis_convolution_worker_spatial.h 2014-02-10 11:21:05.258576197 -0600
+@@ -109,11 +109,11 @@ public:
+ this->m_progress->setProgress(0);
+
+ // Iterate over all pixels in our rect, create a cache of pixels around the current pixel and convolve them.
+- m_pixelPtrCache = new double*[m_cacheSize];
+- m_pixelPtrCacheCopy = new double*[m_cacheSize];
++ m_pixelPtrCache = new qreal*[m_cacheSize];
++ m_pixelPtrCacheCopy = new qreal*[m_cacheSize];
+ for (quint32 c = 0; c < m_cacheSize; ++c) {
+- m_pixelPtrCache[c] = new double[channelCount];
+- m_pixelPtrCacheCopy[c] = new double[channelCount];
++ m_pixelPtrCache[c] = new qreal[channelCount];
++ m_pixelPtrCacheCopy[c] = new qreal[channelCount];
+ }
+
+ // decide caching strategy
diff --git a/calligra.spec b/calligra.spec
index 5cd5158..0c21775 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -32,6 +32,7 @@ Patch1: calligra-2.7.90-no_mpxj.patch
## upstream patches
## upstreamable patches
+Patch201: calligra-2.7.92-qreal.patch
BuildRequires: boost-devel
BuildRequires: bzip2-devel bzip2
@@ -452,6 +453,7 @@ Requires: %{name}-core = %{version}-%{release}
%if ! 0%{?mpxj}
%patch1 -p1 -b .no_mpxj
%endif
+%patch201 -p1 -b .qreal
## kdchart munging begin
pushd 3rdparty/kdchart
More information about the scm-commits
mailing list