]> git.pld-linux.org Git - packages/kde4-calligra.git/blame - eigen3.patch
projects / packages / kde4-calligra.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- icu 67 rebuild
[packages/kde4-calligra.git] / eigen3.patch
CommitLineData
8a490aa8
JR		 1From 2db4438671e17002c7b02e3ad3a5208930765e4f Mon Sep 17 00:00:00 2001
2From: Boudewijn Rempt <boud@valdyas.org>
3Date: Fri, 9 Sep 2016 12:34:13 +0200
4Subject: Remove all occurrences of using Eigen
5
6This way we should be able to use openexr and eigen3's latest
7beta together.
8---
9 image/kis_convolution_kernel.cc | 14 ++++++------
10 image/kis_convolution_kernel.h | 8 +++----
11 image/kis_gaussian_kernel.cpp | 12 +++++-----
12 image/kis_gaussian_kernel.h | 5 ++---
13 image/kis_selection_filters.cpp | 4 ++--
14 image/tests/kis_convolution_painter_test.cpp | 14 ++++++------
15 .../kis_color_selector_ring.cpp | 25 ++++++++++-----------
16 .../waveletdecompose/kis_wavelet_kernel.cpp | 14 ++++++------
17 .../waveletdecompose/kis_wavelet_kernel.h | 5 ++---
18 plugins/filters/blur/kis_gaussian_blur_filter.h | 2 --
19 plugins/filters/blur/kis_lens_blur_filter.cpp | 2 +-
20 plugins/filters/blur/kis_lens_blur_filter.h | 4 +---
21 plugins/filters/blur/kis_motion_blur_filter.cpp | 2 +-
22 plugins/filters/blur/kis_motion_blur_filter.h | 4 +---
23 .../convolutionfilters/convolutionfilters.cpp | 26 ++++++++++------------
24 15 files changed, 64 insertions(+), 77 deletions(-)
25
26diff --git a/krita/image/kis_convolution_kernel.cc b/krita/image/kis_convolution_kernel.cc
27index d6473ba..d2d5d0c 100644
28--- a/krita/image/kis_convolution_kernel.cc
29+++ b/krita/image/kis_convolution_kernel.cc
30@@ -27,7 +27,7 @@
31 struct Q_DECL_HIDDEN KisConvolutionKernel::Private {
32 qreal offset;
33 qreal factor;
34- Matrix<qreal, Dynamic, Dynamic> data;
35+ Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic> data;
36 };
37
38 KisConvolutionKernel::KisConvolutionKernel(quint32 _width, quint32 _height, qreal _offset, qreal _factor) : d(new Private)
39@@ -73,12 +73,12 @@ void KisConvolutionKernel::setFactor(qreal factor)
40 d->factor = factor;
41 }
42
43-Matrix<qreal, Dynamic, Dynamic>& KisConvolutionKernel::data()
44+Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic>& KisConvolutionKernel::data()
45 {
46 return d->data;
47 }
48
49-const Matrix<qreal, Dynamic, Dynamic>* KisConvolutionKernel::data() const
50+const Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic>* KisConvolutionKernel::data() const
51 {
52 return &(d->data);
53 }
54@@ -87,7 +87,7 @@ KisConvolutionKernelSP KisConvolutionKernel::fromQImage(const QImage& image)
55 {
56 KisConvolutionKernelSP kernel = new KisConvolutionKernel(image.width(), image.height(), 0, 0);
57
58- Matrix<qreal, Dynamic, Dynamic>& data = kernel->data();
59+ Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic>& data = kernel->data();
60 #if QT_VERSION >= 0x040700
61 const quint8* itImage = image.constBits();
62 #else
63@@ -118,7 +118,7 @@ KisConvolutionKernelSP KisConvolutionKernel::fromMaskGenerator(KisMaskGenerator*
64 qreal xc = 0.5 * width - 0.5;
65 qreal yc = 0.5 * height - 0.5;
66
67- Matrix<qreal, Dynamic, Dynamic>& data = kernel->data();
68+ Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic>& data = kernel->data();
69 qreal factor = 0;
70
71 // dbgImage << ppVar(xc) << ppVar(yc);
72@@ -138,9 +138,9 @@ KisConvolutionKernelSP KisConvolutionKernel::fromMaskGenerator(KisMaskGenerator*
73 return kernel;
74 }
75
76-KisConvolutionKernelSP KisConvolutionKernel::fromMatrix(Matrix<qreal, Dynamic, Dynamic> matrix, qreal offset, qreal factor)
77+KisConvolutionKernelSP KisConvolutionKernel::fromMatrix(Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic> matrix, qreal offset, qreal factor)
78 {
79- KisConvolutionKernelSP kernel = new KisConvolutionKernel(matrix.cols(), matrix.rows(), offset, factor);
80+ KisConvolutionKernelSP kernel = new KisConvolutionKernel(matrix.cols(), matrix.rows(), offset, factor);
81 kernel->data() = matrix;
82
83 return kernel;
84diff --git a/krita/image/kis_convolution_kernel.h b/krita/image/kis_convolution_kernel.h
85index 7df71dd..8c58839 100644
86--- a/krita/image/kis_convolution_kernel.h
87+++ b/krita/image/kis_convolution_kernel.h
88@@ -25,8 +25,6 @@
89 #include "kritaimage_export.h"
90 #include "kis_types.h"
91
92-using namespace Eigen;
93-
94 class KisMaskGenerator;
95 class QImage;
96
97@@ -46,12 +44,12 @@ public:
98 qreal offset() const;
99 qreal factor() const;
100 void setFactor(qreal);
101- Matrix<qreal, Dynamic, Dynamic>& data();
102- const Matrix<qreal, Dynamic, Dynamic> * data() const;
103+ Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic>& data();
104+ const Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic> * data() const;
105
106 static KisConvolutionKernelSP fromQImage(const QImage& image);
107 static KisConvolutionKernelSP fromMaskGenerator(KisMaskGenerator *, qreal angle = 0.0);
108- static KisConvolutionKernelSP fromMatrix(Matrix<qreal, Dynamic, Dynamic> matrix, qreal offset, qreal factor);
109+ static KisConvolutionKernelSP fromMatrix(Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic> matrix, qreal offset, qreal factor);
110 private:
111 struct Private;
112 Private* const d;
113diff --git a/krita/image/kis_gaussian_kernel.cpp b/krita/image/kis_gaussian_kernel.cpp
114index 822e80e..9f859d2 100644
115--- a/krita/image/kis_gaussian_kernel.cpp
116+++ b/krita/image/kis_gaussian_kernel.cpp
117@@ -34,11 +34,11 @@ int KisGaussianKernel::kernelSizeFromRadius(qreal radius)
118 }
119
120
121-Matrix<qreal, Dynamic, Dynamic>
122+Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic>
123 KisGaussianKernel::createHorizontalMatrix(qreal radius)
124 {
125 int kernelSize = kernelSizeFromRadius(radius);
126- Matrix<qreal, Dynamic, Dynamic> matrix(1, kernelSize);
127+ Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic> matrix(1, kernelSize);
128
129 const qreal sigma = sigmaFromRadius(radius);
130 const qreal multiplicand = 1 / (sqrt(2 * M_PI * sigma * sigma));
131@@ -59,11 +59,11 @@ KisGaussianKernel::createHorizontalMatrix(qreal radius)
132 return matrix;
133 }
134
135-Matrix<qreal, Dynamic, Dynamic>
136+Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic>
137 KisGaussianKernel::createVerticalMatrix(qreal radius)
138 {
139 int kernelSize = kernelSizeFromRadius(radius);
140- Matrix<qreal, Dynamic, Dynamic> matrix(kernelSize, 1);
141+ Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic> matrix(kernelSize, 1);
142
143 const qreal sigma = sigmaFromRadius(radius);
144 const qreal multiplicand = 1 / (sqrt(2 * M_PI * sigma * sigma));
145@@ -87,14 +87,14 @@ KisGaussianKernel::createVerticalMatrix(qreal radius)
146 KisConvolutionKernelSP
147 KisGaussianKernel::createHorizontalKernel(qreal radius)
148 {
149- Matrix<qreal, Dynamic, Dynamic> matrix = createHorizontalMatrix(radius);
150+ Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic> matrix = createHorizontalMatrix(radius);
151 return KisConvolutionKernel::fromMatrix(matrix, 0, matrix.sum());
152 }
153
154 KisConvolutionKernelSP
155 KisGaussianKernel::createVerticalKernel(qreal radius)
156 {
157- Matrix<qreal, Dynamic, Dynamic> matrix = createVerticalMatrix(radius);
158+ Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic> matrix = createVerticalMatrix(radius);
159 return KisConvolutionKernel::fromMatrix(matrix, 0, matrix.sum());
160 }
161
162diff --git a/krita/image/kis_gaussian_kernel.h b/krita/image/kis_gaussian_kernel.h
163index ae59286..ed992ec 100644
164--- a/krita/image/kis_gaussian_kernel.h
165+++ b/krita/image/kis_gaussian_kernel.h
166@@ -23,17 +23,16 @@
167 #include "kis_types.h"
168
169 #include <Eigen/Core>
170-using namespace Eigen;
171
172 class QRect;
173
174 class KRITAIMAGE_EXPORT KisGaussianKernel
175 {
176 public:
177- static Matrix<qreal, Dynamic, Dynamic>
178+ static Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic>
179 createHorizontalMatrix(qreal radius);
180
181- static Matrix<qreal, Dynamic, Dynamic>
182+ static Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic>
183 createVerticalMatrix(qreal radius);
184
185 static KisConvolutionKernelSP
186diff --git a/krita/image/kis_selection_filters.cpp b/krita/image/kis_selection_filters.cpp
187index b790436..2bcdf54 100644
188--- a/krita/image/kis_selection_filters.cpp
189+++ b/krita/image/kis_selection_filters.cpp
190@@ -187,7 +187,7 @@ KUndo2MagicString KisDilateSelectionFilter::name()
191 QRect KisDilateSelectionFilter::changeRect(const QRect& rect)
192 {
193 const qint32 radius = 1;
194- return rect.adjusted(-radius, -radius, radius, radius);
195+ return rect.adjusted(-radius, -radius, radius, radius);
196 }
197
198 void KisDilateSelectionFilter::process(KisPixelSelectionSP pixelSelection, const QRect& rect)
199@@ -483,7 +483,7 @@ void KisFeatherSelectionFilter::process(KisPixelSelectionSP pixelSelection, cons
200 {
201 // compute horizontal kernel
202 const uint kernelSize = m_radius * 2 + 1;
203- Matrix<qreal, Dynamic, Dynamic> gaussianMatrix(1, kernelSize);
204+ Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic> gaussianMatrix(1, kernelSize);
205
206 const qreal multiplicand = 1 / (2 * M_PI * m_radius * m_radius);
207 const qreal exponentMultiplicand = 1 / (2 * m_radius * m_radius);
208diff --git a/krita/image/tests/kis_convolution_painter_test.cpp b/krita/image/tests/kis_convolution_painter_test.cpp
209index d8898fd..efcd181 100644
210--- a/krita/image/tests/kis_convolution_painter_test.cpp
211+++ b/krita/image/tests/kis_convolution_painter_test.cpp
212@@ -56,9 +56,9 @@ KisPaintDeviceSP initAsymTestDevice(QRect &imageRect, int &pixelSize, QByteArray
213 return dev;
214 }
215
216-Matrix<qreal, 3, 3> initSymmFilter(qreal &offset, qreal &factor)
217+Eigen::Matrix<qreal, 3, 3> initSymmFilter(qreal &offset, qreal &factor)
218 {
219- Matrix<qreal, 3, 3> filter;
220+ Eigen::Matrix<qreal, 3, 3> filter;
221 filter(0,0) = 1.0 / 21;
222 filter(0,1) = 3.0 / 21;
223 filter(0,2) = 1.0 / 21;
224@@ -77,9 +77,9 @@ Matrix<qreal, 3, 3> initSymmFilter(qreal &offset, qreal &factor)
225 return filter;
226 }
227
228-Matrix<qreal, 3, 3> initAsymmFilter(qreal &offset, qreal &factor)
229+Eigen::Matrix<qreal, 3, 3> initAsymmFilter(qreal &offset, qreal &factor)
230 {
231- Matrix<qreal, 3, 3> filter;
232+ Eigen::Matrix<qreal, 3, 3> filter;
233 filter(0,0) = 1.0;
234 filter(1,0) = 2.0;
235 filter(2,0) = 1.0;
236@@ -144,7 +144,7 @@ void KisConvolutionPainterTest::testSymmConvolution()
237 {
238 qreal offset = 0.0;
239 qreal factor = 1.0;
240- Matrix<qreal, 3, 3> filter = initSymmFilter(offset, factor);
241+ Eigen::Matrix<qreal, 3, 3> filter = initSymmFilter(offset, factor);
242
243 QRect imageRect;
244 int pixelSize = 0;
245@@ -172,7 +172,7 @@ void KisConvolutionPainterTest::testAsymmConvolutionImp(QBitArray channelFlags)
246 {
247 qreal offset = 0.0;
248 qreal factor = 1.0;
249- Matrix<qreal, 3, 3> filter = initAsymmFilter(offset, factor);
250+ Eigen::Matrix<qreal, 3, 3> filter = initAsymmFilter(offset, factor);
251
252 QRect imageRect;
253 int pixelSize = -1;
254@@ -317,7 +317,7 @@ void KisConvolutionPainterTest::testGaussianBase(KisPaintDeviceSP dev, bool useF
255
256
257 qreal horizontalRadius = 5, verticalRadius = 5;
258-
259+
260 for(int i = 0; i < 3 ; i++, horizontalRadius+=5, verticalRadius+=5)
261 {
262 QTime timer;
263diff --git a/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp b/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp
264index 94e09bb..4ea4143 100644
265--- a/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp
266+++ b/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp
267@@ -21,7 +21,6 @@
268 #include <QMouseEvent>
269
270 #include <Eigen/Core>
271-using namespace Eigen;
272 #include <cmath>
273
274 #include "KoColor.h"
275@@ -53,10 +52,10 @@ bool KisColorSelectorRing::containsPointInComponentCoords(int x, int y) const
276 int innerRadiusSquared = innerRadius();
277 outerRadiusSquared*=outerRadiusSquared;
278 innerRadiusSquared*=innerRadiusSquared;
279-
280-
281- Vector2i relativeVector(x-width()/2, y-height()/2);
282-
283+
284+
285+ Eigen::Vector2i relativeVector(x-width()/2, y-height()/2);
286+
287 if(relativeVector.squaredNorm() < outerRadiusSquared
288 && relativeVector.squaredNorm() > innerRadiusSquared) {
289 return true;
290@@ -72,13 +71,13 @@ void KisColorSelectorRing::paint(QPainter* painter)
291 colorCache();
292 paintCache();
293 }
294-
295+
296 int size = qMin(width(), height());
297 if(m_cachedSize!=size) {
298 m_cachedSize=size;
299 paintCache();
300 }
301-
302+
303 painter->drawImage(width()/2-m_pixelCache.width()/2,
304 height()/2-m_pixelCache.height()/2,
305 m_pixelCache);
306@@ -139,17 +138,17 @@ void KisColorSelectorRing::setColor(const KoColor &color)
307 void KisColorSelectorRing::paintCache()
308 {
309 QImage cache(m_cachedSize, m_cachedSize, QImage::Format_ARGB32_Premultiplied);
310-
311- Vector2i center(cache.width()/2., cache.height()/2.);
312-
313+
314+ Eigen::Vector2i center(cache.width()/2., cache.height()/2.);
315+
316 for(int x=0; x<cache.width(); x++) {
317 for(int y=0; y<cache.height(); y++) {
318- Vector2i currentPoint((float)x, (float)y);
319- Vector2i relativeVector = currentPoint-center;
320+ Eigen::Vector2i currentPoint((float)x, (float)y);
321+ Eigen::Vector2i relativeVector = currentPoint-center;
322
323 qreal currentRadius = relativeVector.squaredNorm();
324 currentRadius=sqrt(currentRadius);
325-
326+
327 if(currentRadius < outerRadius()+1
328 && currentRadius > innerRadius()-1)
329 {
330diff --git a/krita/plugins/filters/blur/kis_gaussian_blur_filter.h b/krita/plugins/filters/blur/kis_gaussian_blur_filter.h
331index ee7bef3..7fd7b11 100644
332--- a/krita/plugins/filters/blur/kis_gaussian_blur_filter.h
333+++ b/krita/plugins/filters/blur/kis_gaussian_blur_filter.h
334@@ -26,8 +26,6 @@
335
336 #include <Eigen/Core>
337
338-using namespace Eigen;
339-
340 class KisGaussianBlurFilter : public KisFilter
341 {
342 public:
343diff --git a/krita/plugins/filters/blur/kis_lens_blur_filter.cpp b/krita/plugins/filters/blur/kis_lens_blur_filter.cpp
344index 81d21d3..92a2ffb 100644
345--- a/krita/plugins/filters/blur/kis_lens_blur_filter.cpp
346+++ b/krita/plugins/filters/blur/kis_lens_blur_filter.cpp
347@@ -165,7 +165,7 @@ void KisLensBlurFilter::processImpl(KisPaintDeviceSP device,
348 imagePainter.drawPolygon(transformedIris, Qt::WindingFill);
349
350 // construct kernel from image
351- Matrix<qreal, Dynamic, Dynamic> irisKernel(kernelHeight, kernelWidth);
352+ Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic> irisKernel(kernelHeight, kernelWidth);
353 for (int j = 0; j < kernelHeight; ++j) {
354 for (int i = 0; i < kernelWidth; ++i) {
355 irisKernel(j, i) = qRed(kernelRepresentation.pixel(i, j));
356diff --git a/krita/plugins/filters/blur/kis_lens_blur_filter.h b/krita/plugins/filters/blur/kis_lens_blur_filter.h
357index 73e7704..8f19045 100644
358--- a/krita/plugins/filters/blur/kis_lens_blur_filter.h
359+++ b/krita/plugins/filters/blur/kis_lens_blur_filter.h
360@@ -1,4 +1,4 @@
361-/*
362+/*
363 * This file is part of Krita
364 *
365 * Copyright (c) 2010 Edward Apap <schumifer@hotmail.com>
366@@ -27,8 +27,6 @@
367
368 #include <Eigen/Core>
369
370-using namespace Eigen;
371-
372 class KisLensBlurFilter : public KisFilter
373 {
374 public:
375diff --git a/krita/plugins/filters/blur/kis_motion_blur_filter.cpp b/krita/plugins/filters/blur/kis_motion_blur_filter.cpp
376index 1e00a14..2924f76 100644
377--- a/krita/plugins/filters/blur/kis_motion_blur_filter.cpp
378+++ b/krita/plugins/filters/blur/kis_motion_blur_filter.cpp
379@@ -119,7 +119,7 @@ void KisMotionBlurFilter::processImpl(KisPaintDeviceSP device,
380 QPointF(kernelWidth / 2 + halfWidth, kernelHeight / 2 - halfHeight));
381
382 // construct kernel from image
383- Matrix<qreal, Dynamic, Dynamic> motionBlurKernel(kernelHeight, kernelWidth);
384+ Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic> motionBlurKernel(kernelHeight, kernelWidth);
385 for (int j = 0; j < kernelHeight; ++j) {
386 for (int i = 0; i < kernelWidth; ++i) {
387 motionBlurKernel(j, i) = qRed(kernelRepresentation.pixel(i, j));
388diff --git a/krita/plugins/filters/blur/kis_motion_blur_filter.h b/krita/plugins/filters/blur/kis_motion_blur_filter.h
389index 3808a99..9eb31f0 100644
390--- a/krita/plugins/filters/blur/kis_motion_blur_filter.h
391+++ b/krita/plugins/filters/blur/kis_motion_blur_filter.h
392@@ -27,8 +27,6 @@
393
394 #include <Eigen/Core>
395
396-using namespace Eigen;
397-
398 class KisMotionBlurFilter : public KisFilter
399 {
400 public:
401diff --git a/krita/plugins/filters/convolutionfilters/convolutionfilters.cpp b/krita/plugins/filters/convolutionfilters/convolutionfilters.cpp
402index 2198e73..d2f4d94 100644
403--- a/krita/plugins/filters/convolutionfilters/convolutionfilters.cpp
404+++ b/krita/plugins/filters/convolutionfilters/convolutionfilters.cpp
405@@ -36,8 +36,6 @@
406
407 #include <Eigen/Core>
408
409-using namespace Eigen;
410-
411 K_PLUGIN_FACTORY(KritaConvolutionFiltersFactory, registerPlugin<KritaConvolutionFilters>();)
412 K_EXPORT_PLUGIN(KritaConvolutionFiltersFactory("krita"))
413
414@@ -68,7 +66,7 @@ KisSharpenFilter::KisSharpenFilter()
415 setSupportsPainting(true);
416 setShowConfigurationWidget(false);
417
418- Matrix<qreal, Dynamic, Dynamic> kernelMatrix(3, 3);
419+ Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic> kernelMatrix(3, 3);
420 kernelMatrix << 0, -2, 0,
421 -2, 11, -2,
422 0, -2, 0;
423@@ -82,7 +80,7 @@ KisMeanRemovalFilter::KisMeanRemovalFilter()
424 setSupportsPainting(false);
425 setShowConfigurationWidget(false);
426
427- Matrix<qreal, Dynamic, Dynamic> kernelMatrix(3, 3);
428+ Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic> kernelMatrix(3, 3);
429 kernelMatrix << -1, -1, -1,
430 -1, 9, -1,
431 -1, -1, -1;
432@@ -96,7 +94,7 @@ KisEmbossLaplascianFilter::KisEmbossLaplascianFilter()
433 setSupportsPainting(false);
434 setShowConfigurationWidget(false);
435
436- Matrix<qreal, Dynamic, Dynamic> kernelMatrix(3, 3);
437+ Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic> kernelMatrix(3, 3);
438 kernelMatrix << -1, 0, -1,
439 0, 4, 0,
440 -1, 0, -1;
441@@ -111,7 +109,7 @@ KisEmbossInAllDirectionsFilter::KisEmbossInAllDirectionsFilter()
442 setSupportsPainting(false);
443 setShowConfigurationWidget(false);
444
445- Matrix<qreal, Dynamic, Dynamic> kernelMatrix(3, 3);
446+ Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic> kernelMatrix(3, 3);
447 kernelMatrix << -1, -1, -1,
448 -1, 8, -1,
449 -1, -1, -1;
450@@ -126,7 +124,7 @@ KisEmbossHorizontalVerticalFilter::KisEmbossHorizontalVerticalFilter()
451 setSupportsPainting(false);
452 setShowConfigurationWidget(false);
453
454- Matrix<qreal, Dynamic, Dynamic> kernelMatrix(3, 3);
455+ Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic> kernelMatrix(3, 3);
456 kernelMatrix << 0, -1, 0,
457 -1, 4, -1,
458 0, -1, 0;
459@@ -141,7 +139,7 @@ KisEmbossVerticalFilter::KisEmbossVerticalFilter()
460 setSupportsPainting(false);
461 setShowConfigurationWidget(false);
462
463- Matrix<qreal, Dynamic, Dynamic> kernelMatrix(3, 3);
464+ Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic> kernelMatrix(3, 3);
465 kernelMatrix << 0, -1, 0,
466 0, 2, 0,
467 0, -1, 0;
468@@ -156,7 +154,7 @@ KisEmbossHorizontalFilter::KisEmbossHorizontalFilter() :
469 setSupportsPainting(false);
470 setShowConfigurationWidget(false);
471
472- Matrix<qreal, Dynamic, Dynamic> kernelMatrix(3, 3);
473+ Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic> kernelMatrix(3, 3);
474 kernelMatrix << 0, 0, 0,
475 -1, 2, -1,
476 0, 0, 0;
477@@ -171,7 +169,7 @@ KisEmbossDiagonalFilter::KisEmbossDiagonalFilter()
478 setSupportsPainting(false);
479 setShowConfigurationWidget(false);
480
481- Matrix<qreal, Dynamic, Dynamic> kernelMatrix(3, 3);
482+ Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic> kernelMatrix(3, 3);
483 kernelMatrix << -1, 0, -1,
484 0, 4, 0,
485 -1, 0, -1;
486@@ -187,7 +185,7 @@ KisTopEdgeDetectionFilter::KisTopEdgeDetectionFilter()
487 setSupportsPainting(false);
488 setShowConfigurationWidget(false);
489
490- Matrix<qreal, Dynamic, Dynamic> kernelMatrix(3, 3);
491+ Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic> kernelMatrix(3, 3);
492 kernelMatrix << 1, 1, 1,
493 0, 0, 0,
494 -1, -1, -1;
495@@ -202,7 +200,7 @@ KisRightEdgeDetectionFilter::KisRightEdgeDetectionFilter()
496 setSupportsPainting(false);
497 setShowConfigurationWidget(false);
498
499- Matrix<qreal, Dynamic, Dynamic> kernelMatrix(3, 3);
500+ Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic> kernelMatrix(3, 3);
501 kernelMatrix << -1, 0, 1,
502 -1, 0, 1,
503 -1, 0, 1;
504@@ -216,7 +214,7 @@ KisBottomEdgeDetectionFilter::KisBottomEdgeDetectionFilter() : KisConvolutionFil
505 setSupportsPainting(false);
506 setShowConfigurationWidget(false);
507
508- Matrix<qreal, Dynamic, Dynamic> kernelMatrix(3, 3);
509+ Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic> kernelMatrix(3, 3);
510 kernelMatrix << -1, -1, -1,
511 0, 0, 0,
512 1, 1, 1;
513@@ -230,7 +228,7 @@ KisLeftEdgeDetectionFilter::KisLeftEdgeDetectionFilter() : KisConvolutionFilter(
514 setSupportsPainting(false);
515 setShowConfigurationWidget(false);
516
517- Matrix<qreal, Dynamic, Dynamic> kernelMatrix(3, 3);
518+ Eigen::Matrix<qreal, Eigen::Dynamic, Eigen::Dynamic> kernelMatrix(3, 3);
519 kernelMatrix << 1, 0, -1,
520 1, 0, -1,
521 1, 0, -1;
522--
523cgit v1.1
524
Calligra - powerful office suite for KDE
This page took 0.093521 seconds and 4 git commands to generate.